Merge 4.2_r3 tag