Fixed issue 7228: Error when adding new language or update survey settings
Dev: cherry pick last commit : c8e668a2143ac5b76c73d116ce63bba0e955e888
Dev: something i don't understand : when it happen ? Old code are clearly broken