Merge branch 'km/maint-doc-git-reset' into maint