diff --git a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
index 56870d68..3c384655 100644
--- a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
+++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
@@ -17,13 +17,13 @@
 #
 
 #issuer of the JWT
-iss=iot_default
+iss=wso2.org/products/iot
 
-TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token
+TokenEndpoint=https://${iot.keymanager.host}:${iot.keymanager.https.port}/oauth2/token
 
 #audience of JWT claim
 #comma seperated values
-aud=wso2.org/products/iot
+aud=devicemgt
 
 #expiration time of JWT (number of minutes from the current time)
 exp=1000
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
deleted file mode 100644
index a0a8cb02..00000000
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2DCRAPI_" context="/dynamic-client-web/register">
-    <resource methods="POST DELETE" url-mapping="/*" faultSequence="_dcr_fault_">
-        <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-            <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
-            <send>
-                <endpoint>
-                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/dynamic-client-web/register">
-                        <timeout>
-                            <duration>60000</duration>
-                            <responseAction>fault</responseAction>
-                        </timeout>
-                    </http>
-                </endpoint>
-            </send>
-        </inSequence>
-        <outSequence>
-            <send/>
-        </outSequence>
-    </resource>
-    <handlers>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
-        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
-    </handlers>
-</api>
\ No newline at end of file
diff --git a/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
index 07b7f035..9ef53ce1 100644
--- a/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
+++ b/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
@@ -17,10 +17,10 @@
   -->
 
 <IdentityProvider>
-	<IdentityProviderName>iot_default</IdentityProviderName>
-	<DisplayName>iot_default</DisplayName>
+	<IdentityProviderName>wso2.org/products/iot</IdentityProviderName>
+	<DisplayName>wso2.org/products/iot</DisplayName>
 	<IdentityProviderDescription></IdentityProviderDescription>
-	<Alias>wso2.org/products/iot</Alias>
+	<Alias>devicemgt</Alias>
 	<IsPrimary>true</IsPrimary>
 	<IsFederationHub></IsFederationHub>
 	<HomeRealmId></HomeRealmId>
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 271da5d0..222efa29 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -163,6 +163,15 @@
                                 </featureArtifactDef>
 			                    <!-- End of Device Management Features -->
 
+								<!-- Device Management Plugin Features -->
+								<featureArtifactDef>
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+								</featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
+								</featureArtifactDef>
+								<!-- End of Device Management Plugin Features -->
+
                                 <!-- IoT Device Management Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
@@ -941,6 +950,14 @@
                                     <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@@ -1589,6 +1606,10 @@
                                     <id>org.wso2.carbon.module.mgt.server.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+									<version>${carbon.analytics.common.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -1859,6 +1880,14 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
@@ -1883,6 +1912,10 @@
                                     <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+									<version>${carbon.device.mgt.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -2287,6 +2320,10 @@
                                     <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+									<version>${carbon.device.mgt.version}</version>
+								</feature>
 
                                 <!--required for context.xml-->
                                 <feature>
@@ -2322,6 +2359,14 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
@@ -2512,6 +2557,14 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -2933,6 +2986,14 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
@@ -3122,6 +3183,14 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -3523,6 +3592,14 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>