Merge branch 'bf/commit-template-no-cleanup'