Aggregation tast improvement.
Merge branch 'ew-dev'