Merge branch 'tg/stash-doc-typofix'