OP-4742 Incorporate some more reseller purchase changes.