Merge from 3.4.2 release head back into 3.4 mainline.