Merge branch 'jc/logs'