Made locale maps more explicit
Merge branch 'dev' into ms