Merge pull request #22389 from colemanw/contactTypes