added support for 1_7_R3 and 1_7_R2