PIM-3377 : re-work locale specific cases