issue #21986: move out the inventory todos