Merge 3.4.x changes into master.