Sorting criteria in the server.
Merge branch 'master' into release