merge 4.2 into 4.3