Add support for 1_7_R2