Fixes #5040: Fix organization wide auto attach of subscriptions via API and UI.
Merge pull request #4307 from ehelms/fixes-5040

Fixes #5040: Fix organization wide auto attach of subscriptions via API ...