Merge branch 'rj/log-decorate-auto'