Merge branch 'jx/i18n-branch-error-messages'