Merge branch 'bc/log-decoration' into maint