Merge "Use SubscriptionId instead of SubId"