Merge "Handle debug messages cleanly" into feature/zuulv3