Merge "Tweak some logging to make things more readable" into main