Merge "Fix constructor arguments to source" into feature/zuulv3