Merge "Log items in loops better" into feature/zuulv3