Merge "Add specific setup inventory" into feature/zuulv3