Merge pull request #14811 from eileenmcnaughton/ex1