Merge "Add additional info to log message." into main