Merge "Return executor errors to user" into feature/zuulv3