MAR-2 - Additional aggregation in the aggregation tool
Merge remote-tracking branch 'origin/develop' into develop