Merge branch 'fix-alphasort' into 'develop'