Merge branch 'pu/inventory'