Merge branch 'for-6.9' into test-merge-for-6.9