Merge changes for logging