Merge "Add spacer line after loops" into feature/zuulv3