Merge branch 'for-4.16' into test-merge-v4.16