adding v1_7_R3 support