Merge pull request #22467 from colemanw/civigrantSearchKitTab