[3.13] gh-153056: Backport the relevant bits of (#153057)#153369

warsaw merged 3 commits into

python:3.13python/cpython:3.13from

warsaw:backport-4572903-3.13warsaw/cpython:backport-4572903-3.13Copy head branch name to clipboard