Fix I18n and partners bugs
Merge branch 'feature/fix_bugs' into develop