Merge pull request #20064 from eileenmcnaughton/info