optional_optimization branch

svn path=/sandbox-branches/optional_optimization/more/; revision=77091