Merge "Fix behaviour of listeners in the InventoryService"