Add 1_7_R4 support