Merge pull request #15439 from eileenmcnaughton/ex_bug