Merge branch 'for-6.18-fixes' into test-merge-6.18-rc2-fixes