Merge feature into Master - Inventory