Merge branch 'bc/author-committer-doc' into maint