Merge branch 'ap/commit-author-mailmap' into maint