Inventory: fixed the bug
Merge origin/M7 into M7