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