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