added CTY-1711 and wpxloc.raw changes