Merge "Update Logging"