Merge pull request #23895 from colemanw/searchKitManaged