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