4.2.2_r1 Merge