Merge pull request #18619 from demeritcowboy/contact-test