Integrate upstream changes from 3.4.3 -> 3.4.6