Merge "Add additional instance info to log" into main