Merge "Support cross-source dependencies" into feature/zuulv3