Merge "Revert "Limited profiles to access only associated subscriptions"" into main