Merge pull request #13618 from eileenmcnaughton/test_info