Merge branch 'lt/log-auto-decorate'