Merge "Log an extra blank line to get space after each skip" into feature/zuulv3