Merge branch 'ja/i18n-cleanup'