Merge pull request #19452 from colemanw/searchKitCustom