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