Merge pull request #23823 from eileenmcnaughton/contact_test