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