Merge "Fix logging output"