Update for 1_6_R2