Merge branch 'jk/maint-commit-document-editmsg' into maint