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