Merge "BUG-625: migrate InventoryAndReadAdapter"