Merge branch 'for-5.14-fixes' into test-merge-for-5.14-fixes