PHOENIX-1252 Potential lock leak for ungrouped aggregation (Jay Wong)