Merge pull request #20125 from colemanw/searchContactRef