Merge "Only output result details on error" into feature/zuulv3