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