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