Inventory: Caps addition based on capacity
Merge origin/M9 into M9