Merge "Fix indentation on debug statement" into feature/zuulv3