Integrated config changes into i18n branch.