Merge pull request #18668 from eileenmcnaughton/no_opt