Merge pull request #22376 from colemanw/searchKitInPlaceCreate