[#82904384] Basic subscriptions, plus other changes needed for UI.
Merge branch 'in-progress'