Merge "Put variables into the inventory" into feature/zuulv3