Merge branch 'sn/doc-typofix'