fix 4.2.2_r1 merge