Forgot to map_locale() granular sortlocale
Merge branch 'dev' into ms