Refactor out sort, skip and limit
Add aggregation to planning
Merge pull request #2399 from systay/ronja-aggregation

Ronja aggregation