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