add cty-1706 and make wpxloc.raw changes