Merge branch 'jc/doc-commit-only'