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