CI update against v1_7_R3