revert change of sort order
Merge remote-tracking branch 'origin/issue-438-2'
Merge remote-tracking branch 'origin/master' into test-with-refactoring