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