Merge pull request #21574 from colemanw/searchPrimary