Merge branch 'jn/maint-commit-missing-template' into maint