Merge branch 'wk/doc-pre-rebase' into maint-1.8.1