Merge pull request #19426 from colemanw/searchCount