re 1076 - making upsell use global tokens