Merge branch 'jc/log-quiet-fix'