Merge pull request #15867 from eileenmcnaughton/test_dumber