Merge "Fix aggregation exception problem"