Merge pull request #17934 from eileenmcnaughton/conttype