Merge pull request #14769 from eileenmcnaughton/ex_test2