Merge branch 'wk/doc-pre-rebase'