Inventory changes
Merge origin/master