diff --git a/CHANGELOG b/CHANGELOG
index be2480c91..25211d44b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2020-04-29 Version: 1.36.390
+- Support groupId operations.
+
 2020-04-29 Version: 1.36.389
 - Add ExportTas apis.
 
diff --git a/VERSION b/VERSION
index d01fb2a9f..44457685a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.36.389
\ No newline at end of file
+1.36.390
\ No newline at end of file
diff --git a/onsmqtt/src/OnsMqttClient.cc b/onsmqtt/src/OnsMqttClient.cc
index d67bcfaff..0302217c2 100644
--- a/onsmqtt/src/OnsMqttClient.cc
+++ b/onsmqtt/src/OnsMqttClient.cc
@@ -31,21 +31,21 @@ OnsMqttClient::OnsMqttClient(const Credentials &credentials, const ClientConfigu
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "onsmqtt");
 }
 
 OnsMqttClient::OnsMqttClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "onsmqtt");
 }
 
 OnsMqttClient::OnsMqttClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "onsmqtt");
 }
 
 OnsMqttClient::~OnsMqttClient()