3.13 backports wip