Merge "Improve and clean up multi-locale support"