Merge pull request #23434 from colemanw/groupByFn