Merge pull request #19800 from eileenmcnaughton/gettypes