Merge "Fix missing source connections on merger" into feature/zuulv3