Merge remote-tracking branch 'b-durand/feature/i18n' into feature/i18n