merge i18n fix with latest official code.