CRM-12351 fix backport to be multi-lingual friendly