Merge "Git driver" into feature/zuulv3