sortlocale on \sort level
Merge branch 'dev' into ms