Test sort
Merge branch 'hotfix/v1.2.3'