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