Forwarded PR: python311 #2

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

@ -1 +1 @@
Subproject commit 35c702e8501eedeb5ce43d6f3460d11c791cfefaa77248f08cad55d00c37e73a
Subproject commit 8e380639782a4508f61d41f3ef4fee334a37e732b475137213025581ba4cfdb8