Forwarded PR: python311 #2

Closed
adamm wants to merge 3 commits from PR_python311#1 into main