Merge "Fix branch checkout order" into feature/zuulv3