Merge remote-tracking branch 'HHGAG/feature/i18n' into feature/i18n