Will make a change in the i18n module and will change that in the future patch.