Development -  latest updates for master

Includes Subscription authorization checks.