Merge branch 'nd/commit-hook-doc-fix' into maint