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