Merge "Updates to Inventory object" into stable/euphrates