3.6.x Cherry picks

I've gone through all of my changes, plus all external contributors.