Merge branch 'pb/rebase-doc-typofix'