Merge branch 'cc/perf-aggregate'