Merge branch 'mg/log-decorate-HEAD' into maint