Merge branch 'jx/i18n-1.7.11'