Merge "Fix dependency cycle false positive" into feature/zuulv3