CDV13: Consumable changes, part 2