Merge "Fix a debug-output formatting error" into main