BZ-1094282 - Localization issues