Merge branch 'for-3.10-fixes' into for-3.11