Merge branch 'bc/log-decoration'