Merge branch 'cc/maint-commit-reflog-msg'