3.6.x changes missing from master.