Merge branch 'mg/fix-log-mergetag-color' into maint