fix locales
Merge branch 'hotfix/fix_locales'

* hotfix/fix_locales:
  fix locales