DEVIDM-109: Fixed the header locale problems