merge in 4.2.1_r1