Merge "Logging improvements"