TMDM-7546 : Fixes merge that overriden changes from TMDM-7548 (for default locale and russian).