Issue #24177:change group by
Merge pull request #1689 from garyhgohoos/24177

Issue #24177:change group by