Merge "Add inventory variables for checkouts" into feature/zuulv3