Merge pull request #22724 from braders/feature/group-search-null-columns