merge 4.3 into 5.1