Merge "Return a distinct result on executor disk full" into feature/zuulv3