Merge branch 'rr/doc-commit' into maint