Merge "Renamed SUB_ID to SUBSCRIPTION_ID"