Merge pull request #21752 from colemanw/searchKitPermissionFix