Merge branch 'sorted-aggregate'