Merge 4.4.2_r2 tag