Merge "API changes for slicing upsell"