Bug 3341: Partial fix, wires inventory-manager