diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 4c2b42ce..c24afad6 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -744,61 +744,50 @@
             <fileMode>755</fileMode>
         </file>
         <!-- End of "portal" app specific modifications -->
-
-        <!-- Copying email-sender-config.xml -->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
+            <!--</outputDirectory>-->
+            <!--<fileMode>755</fileMode>-->
+        <!--</file>-->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
+            <!--</outputDirectory>-->
+            <!--<fileMode>755</fileMode>-->
+        <!--</file>-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            </outputDirectory>
+            <destName>devicemgt_admin.war</destName>
         </file>
-
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
+                ../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            <source>../tools/mdm-android-agent-archetype/README.txt</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
+            <source>../tools/mdm-android-agent-archetype/android-agent.sh</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
             </outputDirectory>
-            <destName>devicemgt_admin.war</destName>
+            <fileMode>755</fileMode>
         </file>
-        <!--<file>-->
-            <!--<source>-->
-                <!--../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
-        <!--<file>-->
-            <!--<source>../tools/mdm-android-agent-archetype/README.txt</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
-        <!--<file>-->
-            <!--<source>../tools/mdm-android-agent-archetype/android-agent.sh</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/tools-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
         <!-- Copying synapse.properties file -->
         <file>
             <source>src/repository/conf/synapse.properties</source>
@@ -1047,15 +1036,7 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--Notification Config File-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/notification-messages.xml-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
-            <!--<filtered>true</filtered>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
+
         <!-- Copying the modified registry.xml file-->
         <file>
             <source>
@@ -1065,6 +1046,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <!-- Copying email-sender-config.xml -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!--cdm plugin config file-->
         <file>
             <source>
@@ -1113,77 +1103,77 @@
             <fileMode>644</fileMode>
         </file>
         <!-- Copying ANDROID SENSE H2 database -->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>AndroidSenseDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!--&lt;!&ndash; Copying ARDUINO H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>ArduinoDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!--&lt;!&ndash; Copying DIGITAL DISPLAY H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DigitalDisplayDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>DigitalDisplayDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!--&lt;!&ndash; Copying DRONE ANALYZER H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DroneAnalyzerDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>DroneAnalyzerDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!--&lt;!&ndash; Copying RASPBERRY-PI H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>RaspberryPiDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!--&lt;!&ndash; Copying VIRTUAL-FIREALARM H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>VirtualFireAlarmDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!-- Copying MOBILE-ANDROID H2 database -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>WSO2MobileAndroid_DB.h2.db</destName>
+            <destName>AndroidSenseDM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying MOBILE-WINDOWS H2 database -->
+        <!-- Copying ARDUINO H2 database -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/ArduinoDM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>WSO2MobileWindows_DB.h2.db</destName>
+            <destName>ArduinoDM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
+        <!-- Copying DIGITAL DISPLAY H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DigitalDisplayDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>DigitalDisplayDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- Copying DRONE ANALYZER H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/DroneAnalyzerDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>DroneAnalyzerDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- Copying RASPBERRY-PI H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/RaspberryPiDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>RaspberryPiDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- Copying VIRTUAL-FIREALARM H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/VirtualFireAlarmDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>VirtualFireAlarmDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- Copying MOBILE-ANDROID H2 database -->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
+            <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
+        <!--&lt;!&ndash; Copying MOBILE-WINDOWS H2 database &ndash;&gt;-->
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
+            <!--<destName>WSO2MobileWindows_DB.h2.db</destName>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
         <file>
             <source>src/repository/conf/carbon.xml
             </source>
@@ -1380,6 +1370,14 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-analytics-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml
diff --git a/modules/features/org.wso2.iot.styles.feature/pom.xml b/modules/features/org.wso2.iot.styles.feature/pom.xml
index 520bfaa2..eff5e956 100644
--- a/modules/features/org.wso2.iot.styles.feature/pom.xml
+++ b/modules/features/org.wso2.iot.styles.feature/pom.xml
@@ -24,13 +24,12 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-features</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.iot.styles.feature</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 IoT Server Styles Feature</name>
     <url>http://wso2.org</url>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 02d18bca..b4db21c0 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -30,7 +30,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2iot-features</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 IoT Server UI Features</name>
     <url>http://wso2.org</url>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 85dedfb3..fcc16160 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -135,9 +135,15 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.data.publisher.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
@@ -147,14 +153,11 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-                                <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>
                                 <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version}-->
+                                    <!--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>-->
                                 <!-- Mobile Device Management Features -->
 
@@ -162,24 +165,24 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                                 <!-- IoT Device Management Features -->
 
                                 <!-- Carbon Deployment Features -->
@@ -415,7 +418,7 @@
 
                                 <!--- MDM Features -->
                                 <featureArtifactDef>
-                                    org.wso2.iot:org.wso2.iot.styles.feature:${carbon.device.mgt.plugin.version}
+                                    org.wso2.iot:org.wso2.iot.styles.feature:${carbon.iot.device.mgt.version}
                                 </featureArtifactDef>
 
                                 <!-- Mediation Features -->
@@ -799,6 +802,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
                                 </featureArtifactDef>
+                                <!--JWT grant type handler-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
                                 </featureArtifactDef>
@@ -828,7 +832,7 @@
                                 <!-- IoTServer Features -->
                                 <feature>
                                     <id>org.wso2.iot.styles.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <version>${carbon.iot.device.mgt.version}</version>
                                 </feature>
                                 <!-- End of IoTServer Features -->
 
@@ -845,6 +849,14 @@
                                     <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -865,10 +877,6 @@
                                     <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.email.sender.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -877,53 +885,53 @@
                                     <!--<id>org.wso2.carbon.device.mgt.common.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>
                                 <!-- End of Device Management Features -->
 
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.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.mobile.android.feature.group</id>
+                                    <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.mdm.mdmmgt.server.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
+                                    <id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                 <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.droneanalyzer.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-                                 <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.iot.droneanalyzer.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
 
                                 <!-- Carbon Deployment Features -->
                                 <feature>
@@ -1693,6 +1701,7 @@
                                     <id>org.wso2.carbon.metrics.feature.group</id>
                                     <version>${carbon.metrics.version}</version>
                                 </feature>
+                                <!--jwt grant type handler-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
                                     <version>${identity.jwt.extension.version}</version>
diff --git a/pom.xml b/pom.xml
index b5601326..536c7163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1059,7 +1059,7 @@
         <carbon.mediation.version>4.5.1</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.0.11-SNAPSHOT</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.0.12-SNAPSHOT</carbon.analytics.common.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -1076,10 +1076,10 @@
         <!--DAS-->
         <carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
-        <carbon.dashboard.version>1.0.14-SNAPSHOT</carbon.dashboard.version>
+        <carbon.dashboard.version>1.0.13</carbon.dashboard.version>
         <shindig.version>1.0.0</shindig.version>
         <carbon.event-processing.version>2.0.12</carbon.event-processing.version>
-        <carbon.data.version>4.3.5-SNAPSHOT</carbon.data.version>
+        <carbon.data.version>4.3.4</carbon.data.version>
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
         <wss4j.security.version>1.6.17</wss4j.security.version>