GF-61238, GF-61239 fix error when locale is Thai -RC