Merge pull request #19554 from colemanw/searchFields