[6.0.2] Query: Avoid stackoverflow in lifting group by aggregate term#27131