Merge "Use new SubscriptionInfo constructor"