Upgrade completed.
I have done some work to improve a better checkout experience too.
There is still some work to do, the upgrade does no longer show the promotional items as a separate list, but they are visible on the product page. In time this will be resolved to make it easier to find them.
PS Timeline
#005d95
