fix 4.2.2._r1 merge