Merge "Make the log format more realistic" into main