The sorting problem is solved in the patch. But it will still solve the aggregation problem. I think that it would be possible to pick it up completely.