Merge "Add Logging"