Merge branch 'wk/doc-clarify-upstream'