[3.11] GH-93516: Backport GH-93769 - #94231

[3.11] GH-93516: Backport GH-93769#94231

markshannon merged 6 commits into

python:3.11python/cpython:3.11from

faster-cpython:backport-93769faster-cpython/cpython:backport-93769Copy head branch name to clipboard