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

* commit 'e80c6f17079155855aa11eae47b619af0ebb591c':
  Fix issues with multiple languages and multi-users