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