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