Merged all changes from both multilanguage and latest master