diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 86a47221..43806ba1 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -1255,5 +1255,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-api-config.xml
+            </source>
+            <outputDirectory>
+                ${pom.artifactId}-${pom.version}/repository/conf/
+            </outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>
diff --git a/modules/core/distribution/src/repository/conf/axis2/axis2.xml b/modules/core/distribution/src/repository/conf/axis2/axis2.xml
index fbe95442..64bd8ab5 100644
--- a/modules/core/distribution/src/repository/conf/axis2/axis2.xml
+++ b/modules/core/distribution/src/repository/conf/axis2/axis2.xml
@@ -152,6 +152,14 @@
     <!-- for different message format serializations in Axis2. These message formats are -->
     <!-- expected to be resolved based on the content type. -->
     <messageFormatters>
+        <messageFormatter contentType="application/x-apple-aspen-mdm"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+        <messageFormatter contentType="application/x-apple-aspen-config"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+
+        <messageFormatter contentType="application/pkcs7-signature"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+
         <messageFormatter contentType="application/x-www-form-urlencoded"
                           class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
@@ -220,6 +228,15 @@
     <!-- different message formats in Axis2. These message formats are expected to be -->
     <!-- resolved based on the content type. -->
     <messageBuilders>
+
+        <messageBuilder contentType="application/x-apple-aspen-mdm"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+        <messageBuilder contentType="application/x-apple-aspen-config"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+
+        <messageBuilder contentType="application/pkcs7-signature"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+
         <messageBuilder contentType="application/xml"
                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
         <messageBuilder contentType="text/html"
@@ -322,6 +339,7 @@
                 <Password>wso2carbon</Password>
             </TrustStore>
         </parameter>
+        <parameter name="HostnameVerifier">AllowAll</parameter>
         <!--<parameter name="SSLVerifyClient">require</parameter>
             supports optional|require or defaults to none -->
     </transportReceiver>
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 49d6ba81..b1b305b9 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -146,6 +146,9 @@
                                 <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.apimgt.handler.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
@@ -891,6 +894,10 @@
                                     <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.handler.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -1818,6 +1825,10 @@
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.apimgt.handler.server.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>