Added support for 1.7_R4