Merge pull request #20537 from colemanw/searchKitLinkFix