2.0.x backports