Merge branch 'tg/stash-doc-cleanup'