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