[#56993770] Reapplied i18n changes