Merge pull request #22557 from colemanw/searckKitLinkConditions