Add support for 1_6_R3