Merge branch 'jc/commit-unedited-template' into maint