Merge branch 'cc/perf-aggregate-sort'