Merge branch 'logging-fix'