diff --git a/modules/distribution/src/analytics/conf/input-adapter-change.xml b/modules/distribution/src/analytics/conf/input-adapter-change.xml
index f716cd3e..a978a68c 100644
--- a/modules/distribution/src/analytics/conf/input-adapter-change.xml
+++ b/modules/distribution/src/analytics/conf/input-adapter-change.xml
@@ -28,6 +28,8 @@
 	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
 	<property key="username">admin</property>
 	<property key="password">admin</property>
+	<property key="contentValidator">iot-mqtt</property>
+	<property key="cleanSession">true</property>
 </adapterConfig>]]></value>
 	</add>
 </processor>
\ No newline at end of file
diff --git a/modules/distribution/src/analytics/conf/output-adapter-change.xml b/modules/distribution/src/analytics/conf/output-adapter-change.xml
index 6db841ef..89d97b19 100644
--- a/modules/distribution/src/analytics/conf/output-adapter-change.xml
+++ b/modules/distribution/src/analytics/conf/output-adapter-change.xml
@@ -14,6 +14,8 @@
         <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property key="username">admin</property>
 		<property key="password">admin</property>
+		<property key="qos">2</property>
+		<property key="clearSession">true</property>
     </adapterConfig>
 
     <adapterConfig type="secured-websocket">
@@ -33,7 +35,6 @@
         <property key="username">admin</property>
         <property key="password">admin</property>
         <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
-        <property key="statsPermission">/permission/admin/device-mgt/realtime_analytics</property>
         <!--offset time from expiry time to trigger refresh call (in seconds)-->
         <property key="tokenRefreshTimeOffset">100</property>
     </adapterConfig>]]></value>
diff --git a/modules/distribution/src/analytics/plugins/pom.xml b/modules/distribution/src/analytics/plugins/pom.xml
index aeb6830a..c8f3d8d5 100644
--- a/modules/distribution/src/analytics/plugins/pom.xml
+++ b/modules/distribution/src/analytics/plugins/pom.xml
@@ -47,16 +47,11 @@
                             <goal>p2-repo-gen</goal>
                         </goals>
                         <configuration>
-                            <metadataRepository>file:${project.basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${project.basedir}/target/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
-                                <!-- Android Sense Device Type Features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-
                                 <!-- Ardino Device Type Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.analytics.feature:${carbon.device.mgt.plugin.version}
@@ -82,15 +77,11 @@
                         </goals>
                         <configuration>
                             <profile>analytics-default</profile>
-                            <metadataRepository>file:${project.basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${project.basedir}/target/p2-repo</artifactRepository>
-                            <destination>${project.basedir}/../../components</destination>
+                            <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
+                            <destination>\${project.basedir}/../../components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.arduino.analytics.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -211,6 +202,6 @@
     </repositories>
 
     <properties>
-        <carbon.device.mgt.plugin.version>3.0.33</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
     </properties>
 </project>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 7dc88929..50fd397b 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -864,6 +864,22 @@
             </outputDirectory>
         </fileSet>
 
+		<fileSet>
+			<directory>
+				../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/eventstreams/
+			</directory>
+			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventstreams/
+			</outputDirectory>
+		</fileSet>
+
+		<fileSet>
+			<directory>
+				../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/eventreceivers/
+			</directory>
+			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventreceivers/
+			</outputDirectory>
+		</fileSet>
+
         <fileSet>
             <directory>
                 ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources
@@ -902,6 +918,7 @@
         <fileSet>
             <directory>src/analytics/plugins</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory>
+			<filtered>true</filtered>
         </fileSet>
 
         <fileSet>
diff --git a/modules/distribution/src/core/conf/input-adapter-change.xml b/modules/distribution/src/core/conf/input-adapter-change.xml
index f716cd3e..101db791 100644
--- a/modules/distribution/src/core/conf/input-adapter-change.xml
+++ b/modules/distribution/src/core/conf/input-adapter-change.xml
@@ -15,6 +15,7 @@
 	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
 	<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
 	<property key="tokenRefreshTimeOffset">100</property>
+	<property key="contentValidator">iot-http</property>
 </adapterConfig>
 
 <adapterConfig type="oauth-mqtt">
@@ -28,6 +29,8 @@
 	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
 	<property key="username">admin</property>
 	<property key="password">admin</property>
+	<property key="contentValidator">iot-mqtt</property>
+	<property key="cleanSession">true</property>
 </adapterConfig>]]></value>
 	</add>
 </processor>
\ No newline at end of file
diff --git a/modules/distribution/src/core/conf/output-adapter-change.xml b/modules/distribution/src/core/conf/output-adapter-change.xml
index 6db841ef..66bd32df 100644
--- a/modules/distribution/src/core/conf/output-adapter-change.xml
+++ b/modules/distribution/src/core/conf/output-adapter-change.xml
@@ -14,6 +14,8 @@
         <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
         <property key="username">admin</property>
 		<property key="password">admin</property>
+		<property key="qos">2</property>
+		<property key="clearSession">true</property>
     </adapterConfig>
 
     <adapterConfig type="secured-websocket">
@@ -32,8 +34,6 @@
         <property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
         <property key="username">admin</property>
         <property key="password">admin</property>
-        <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
-        <property key="statsPermission">/permission/admin/device-mgt/realtime_analytics</property>
         <!--offset time from expiry time to trigger refresh call (in seconds)-->
         <property key="tokenRefreshTimeOffset">100</property>
     </adapterConfig>]]></value>
diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/plugins/plugins-deployer.xml
index 21e7d95e..5fe2d560 100644
--- a/modules/distribution/src/core/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/core/plugins/plugins-deployer.xml
@@ -55,14 +55,6 @@
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
-                                <!-- Android Sense Device Type Features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-
                                 <!-- Ardino Device Type Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.ui.feature:${carbon.device.mgt.plugin.version}
@@ -102,16 +94,6 @@
                             <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
-                                <!-- Android Sense Device Type Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-
                                 <!-- Ardino Device Type Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.arduino.ui.feature.group</id>
@@ -157,12 +139,6 @@
                             <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
-                                <!-- Android Sense Device Type UI Feature -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-
                                 <!-- Ardino Device Type UI Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.arduino.ui.feature.group</id>
@@ -196,12 +172,6 @@
                             <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
-                                <!-- Android Sense Device Type BE Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-
                                 <!-- Ardino Device Type BE Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.arduino.backend.feature.group</id>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index af59e28c..b628623f 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -115,9 +115,6 @@
                                 </featureArtifactDef>
                                 <!-- END - Analytics features -->
 
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
                                 </featureArtifactDef>
@@ -392,7 +389,7 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
 								<featureArtifactDef>
-                                    org.wso2.carbon.identity.carbon.auth.mutualssl:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
 								</featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -806,12 +803,6 @@
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-
-                                <!-- IoT Analytics Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
@@ -831,6 +822,12 @@
                                     <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+								<!--android sense analytics feature-->
+								<feature>
+									<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index fc2433c9..2dd5845b 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -1610,6 +1610,7 @@
                             </features>
                         </configuration>
                     </execution>
+					
                     <!--Key Manager Profile-->
                     <execution>
                         <id>6-p2-profile-generation</id>
diff --git a/pom.xml b/pom.xml
index 673b5716..381d410a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1513,7 +1513,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.61</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.64</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1521,7 +1521,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>3.0.33</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.34</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>