diff --git a/modules/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml b/modules/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
index 768bb156..a0a8cb02 100644
--- a/modules/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
+++ b/modules/distribution/src/api-resources/synapse-configs/default/api/_Dynamic_Client_Registration_API_.xml
@@ -1,5 +1,5 @@
-<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2DCRAPI_" context="/dcr">
-    <resource methods="POST DELETE" url-mapping="/register" faultSequence="_dcr_fault_">
+<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')"/>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index db34fd54..87e7d5a9 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -500,8 +500,8 @@
         </fileSet>
 
         <fileSet>
-            <directory>src/api-resources/synapse-configs/default/sequences</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs/default/sequences</outputDirectory>
+            <directory>src/api-resources/synapse-configs</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs/</outputDirectory>
         </fileSet>
 
         <fileSet>
@@ -512,17 +512,6 @@
             </includes>
         </fileSet>
 
-        <!-- Copying synapse-config directory -->
-        <fileSet>
-            <directory>src/repository/resources</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server
-            </outputDirectory>
-            <excludes>
-                <exclude>**/empty.txt</exclude>
-                <exclude>**/styles/**</exclude>
-            </excludes>
-        </fileSet>
-
         <!-- Copying RXTs corresponding API management related components -->
         <fileSet>
             <directory>
diff --git a/modules/distribution/src/repository/resources/security/wso2certs.jks b/modules/distribution/src/repository/resources/security/wso2certs.jks
deleted file mode 100644
index 00589cdf..00000000
Binary files a/modules/distribution/src/repository/resources/security/wso2certs.jks and /dev/null differ
diff --git a/modules/distribution/src/samples-deployer.xml b/modules/distribution/src/samples-deployer.xml
index b4aacedf..663d7b9c 100644
--- a/modules/distribution/src/samples-deployer.xml
+++ b/modules/distribution/src/samples-deployer.xml
@@ -150,6 +150,7 @@
                 <version>1.1</version>
                 <executions>
                     <execution>
+                        <id>default-feature-install</id>
                         <phase>package</phase>
                         <configuration>
                             <tasks>
@@ -163,6 +164,21 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>devicetype-feature-install</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <replace token="false" value="true"
+                                         dir="repository/components/devicetype-publisher/configuration/org.eclipse.equinox.simpleconfigurator">
+                                    <include name="**/bundles.info"/>
+                                </replace>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 1c1a57d8..2632d604 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -453,9 +453,6 @@
                                 </featureArtifactDef>
 
                                 <!-- Carbon Commons Features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.ndatasource.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -568,13 +565,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.deployment:org.wso2.carbon.bam.service.agent.feature:${carbon.deployment.version}
-                                </featureArtifactDef>
+
                                 <!--End of APIM Feature-->
 
                                 <!--DAS Feature-->
-
                                 <!--START - Analytics Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
@@ -674,10 +668,18 @@
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
                                 </featureArtifactDef>
 				                <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
                                 </featureArtifactDef>
+
+
                                 <!--End of DAS Feature-->
 
                                 <!-- Dashboards Features -->
@@ -1796,11 +1798,6 @@
                                     <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.commons.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -2217,10 +2214,6 @@
                                     <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.commons.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -2432,10 +2425,6 @@
                                     <id>org.wso2.carbon.idp.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.bam.service.agent.feature.group</id>
-                                    <version>${carbon.deployment.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ndatasource.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -2720,11 +2709,6 @@
                                     <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.commons.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -2733,7 +2717,6 @@
                                     <id>org.apache.synapse.transport.nhttp.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
                                 </feature>
-
                                 <feature>
                                     <id>org.wso2.carbon.task.server.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -2742,7 +2725,6 @@
                                     <id>org.wso2.carbon.mediation.initializer.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
                                 </feature>
-
                                 <feature>
                                     <id>org.wso2.carbon.mediation.admin.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -3012,10 +2994,6 @@
                                     <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.bam.service.agent.feature.group</id>
-                                    <version>${carbon.deployment.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.metrics.feature.group</id>
                                     <version>${carbon.metrics.version}</version>
@@ -3090,6 +3068,18 @@
                                     <id>org.wso2.carbon.spark.commons.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -3271,10 +3261,6 @@
                                     <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.commons.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -3556,10 +3542,6 @@
                                     <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.bam.service.agent.feature.group</id>
-                                    <version>${carbon.deployment.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.metrics.feature.group</id>
                                     <version>${carbon.metrics.version}</version>
@@ -3634,6 +3616,18 @@
                                     <id>org.wso2.carbon.spark.commons.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/modules/samples/installer/device-deployer.xml b/modules/samples/installer/device-deployer.xml
index ee37db60..8f8f40f0 100644
--- a/modules/samples/installer/device-deployer.xml
+++ b/modules/samples/installer/device-deployer.xml
@@ -89,12 +89,35 @@
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-                                <!-- STEP#3. ADD YOUR DEVICE TYPE FEATURE GROUP HERE  "<ARTIFACT_ID>.group" -->
                                 <feature>
                                     <id>org.coffeeking.connectedcup.feature.group</id>
                                     <version>1.0.0-SNAPSHOT</version>
                                 </feature>
-				<feature>
+				                <feature>
+                                    <id>org.wso2.connectedlap.feature.group</id>
+                                    <version>1.0.0-SNAPSHOT</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>devicetype-feature-install</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>devicetype-publisher</profile>
+                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
+                            <destination>repository/components</destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <feature>
+                                    <id>org.coffeeking.connectedcup.feature.group</id>
+                                    <version>1.0.0-SNAPSHOT</version>
+                                </feature>
+                                <feature>
                                     <id>org.wso2.connectedlap.feature.group</id>
                                     <version>1.0.0-SNAPSHOT</version>
                                 </feature>
@@ -116,6 +139,10 @@
                                          dir="repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
                                     <include name="**/bundles.info"/>
                                 </replace>
+                                <replace token="false" value="true"
+                                         dir="repository/components/devicetype-publisher/configuration/org.eclipse.equinox.simpleconfigurator">
+                                    <include name="**/bundles.info"/>
+                                </replace>
                             </tasks>
                         </configuration>
                         <goals>