Merge 4.3_r2.1 changes