Merge branch 'for-3.13-fixes' into for-3.14