Merge branch 'jk/doc-do-not-write-extern'