Merge branch 'km/rebase-doc-typofix'