Merge "Support multiple versions under a service name"