Merge pull request #20132 from colemanw/renameSearchKit