Merge "Support API changes for slicing upsell"