Better locale attr fix
Merge branch 'dev' into ms