Merge "Fix issues with multiple languages and multi-users" into lmp-dev