Fixed sorting inconsistency.
Merge branch 'release-2.3'