Inventory Test merge with master