Merge pull request #40546 from barredterra/fix-group-by