Basically-working subscription upgrades
Merged changes