Merge branch 'for-4.20-fixes' into for-4.21