Update to 1_7_R4