Merge "Require a base job" into feature/zuulv3