Merge branch 'sn/reset-doc-typofix' into maint