Re-integrate export-optimization branch.