Update to nms 1_7_R4