Merge "Debug job selection" into feature/zuulv3