Revert "Revert "ref #7589 Removed unnecessary sorting""
This reverts commit ece5c710330621bdd694f4c1f554f6cc8467c95b.
Revert "Revert "ref #7589 Removed unnecessary sorting""
This reverts commit ece5c710330621bdd694f4c1f554f6cc8467c95b.