Merge pull request #15954 from eileenmcnaughton/ex_silly