optional_optimization branch

[SVN r77091]