Merge branch 'mz/doc-rebase-abort'