(cherry picked from commit fe2ad927f4) Co-authored-by: Steve Dower <steve.dower@python.org>
fe2ad927f4
Includes backported fixes from GH-14091