Merge "New container for logging"