Merge branch 'upstream' into doc-orig