Merge "Add global-customer-id and service-type parameter"