Fixed missing sort order
Merge branch '2.0'