2.x backport