Merge "SubscriptionServiceType is null in request to SO"