Merge "Change logging for now"