Remove unused subscription downgrade logic
Merge branch 'master' into master-redesign
Fix include paths