Nested Grouping

This include the code fix with 50k rows