Merge branch 'python-fix-pr10227' into maint