merge 4.2 changes