merge in 4.2.2_r1