Merge branch 'ma/rebase-doc-typofix' into master