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