Merge pull request #12411 from eileenmcnaughton/matt_opt