Merge "Fix branch matching logic" into feature/zuulv3