Merge "Add some detail to debug log" into main