Issue #24177:change group by