diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 55cda758..ac35f977 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -49,6 +49,8 @@
                 <exclude>**/repository/conf/security/cipher-tool.properties</exclude>
 				<exclude>**/repository/deployment/server/jaggeryapps/portal/modules/oauth/plugins/token-handler-utils.js</exclude>
 				<exclude>**/repository/deployment/server/jaggeryapps/portal/modules/oauth/plugins/token-handlers.js</exclude>
+				<exclude>**/repository/conf/security/authenticators.xml</exclude>
+				<exclude>**/repository/conf/tomcat/catalina-server.xml</exclude>
             </excludes>
         </fileSet>
         <fileSet>
@@ -404,6 +406,21 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+		<file>
+			<source>
+				src/repository/conf/security/authenticators.xml
+			</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/
+			</outputDirectory>
+			<filtered>true</filtered>
+			<fileMode>644</fileMode>
+		</file>
+		<file>
+			<source>src/repository/conf/tomcat/catalina-server.xml</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
+			<filtered>true</filtered>
+			<fileMode>644</fileMode>
+		</file>
         <!-- ************* tomcat webapp hosting related files end ********** -->
 
         <!-- Event broker configuration for deployment sync -->
@@ -814,7 +831,7 @@
         <!-- Adding IoT Analytics Dashboard and gadget CApps -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
             <fileMode>644</fileMode>
diff --git a/modules/analytics/distribution/src/repository/conf/security/authenticators.xml b/modules/analytics/distribution/src/repository/conf/security/authenticators.xml
new file mode 100644
index 00000000..7fb33e27
--- /dev/null
+++ b/modules/analytics/distribution/src/repository/conf/security/authenticators.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+     This is the configuration file for Carbon authenticators. All the authenticator related configurations
+     should go here.
+-->
+<Authenticators xmlns="http://wso2.org/projects/carbon/authenticators.xml">
+
+	<!-- Authenticator Configurations for TokenUIAuthenticator -->
+	<Authenticator name="TokenUIAuthenticator" disabled="true">
+		<Priority>5</Priority>
+	</Authenticator>
+
+	<!-- Authenticator Configurations for SAML2SSOAuthenticator -->
+	<Authenticator name="SAML2SSOAuthenticator" disabled="true">
+		<Priority>10</Priority>
+		<Config>
+			<Parameter name="LoginPage">/carbon/admin/login.jsp</Parameter>
+			<Parameter name="ServiceProviderID">carbonServer</Parameter>
+			<Parameter name="IdentityProviderSSOServiceURL">https://localhost:9443/samlsso</Parameter>
+			<Parameter name="NameIDPolicyFormat">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</Parameter>
+			<Parameter name="AssertionConsumerServiceURL">https://localhost:9443/acs</Parameter>
+
+			<!-- <Parameter name="IdPCertAlias">wso2carbon</Parameter> -->
+			<!-- <Parameter name="ResponseSignatureValidationEnabled">false</Parameter> -->
+			<!-- <Parameter name="AssertionSignatureValidationEnabled">false</Parameter> -->
+			<!-- <Parameter name="LoginAttributeName"></Parameter> -->
+			<!-- <Parameter name="RoleClaimAttribute"></Parameter> -->
+			<!-- <Parameter name="AttributeValueSeparator">,</Parameter> -->
+
+			<!-- <Parameter name="JITUserProvisioning">true</Parameter> -->
+			<!-- <Parameter name="ProvisioningDefaultUserstore">PRIMARY</Parameter> -->
+			<!-- <Parameter name="ProvisioningDefaultRole">admin</Parameter> -->
+			<!-- <Parameter name="IsSuperAdminRoleRequired">true</Parameter> -->
+		</Config>
+
+		<!-- If this authenticator should skip any URI from authentication, specify it under "SkipAuthentication"
+		<SkipAuthentication>
+				<UrlContains></UrlContains>
+			</SkipAuthentication> -->
+
+		<!-- If this authenticator should skip any URI from session validation, specify it under "SkipAuthentication
+			<SkipSessionValidation>
+				<UrlContains></UrlContains>
+			</SkipSessionValidation> -->
+	</Authenticator>
+
+	<!-- Authenticator Configurations for MutualSSLAuthenticator -->
+	<Authenticator name="MutualSSLAuthenticator" disabled="false">
+	  <Priority>5</Priority>
+	  <Config>
+		  <Parameter name="UsernameHeader">UserName</Parameter>
+		  <Parameter name="WhiteListEnabled">false</Parameter>
+		  <Parameter name="WhiteList"/>
+	  </Config>
+	</Authenticator>
+
+</Authenticators>
\ No newline at end of file
diff --git a/modules/analytics/distribution/src/repository/conf/tomcat/catalina-server.xml b/modules/analytics/distribution/src/repository/conf/tomcat/catalina-server.xml
new file mode 100644
index 00000000..c68a93ef
--- /dev/null
+++ b/modules/analytics/distribution/src/repository/conf/tomcat/catalina-server.xml
@@ -0,0 +1,99 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<Server port="8005" shutdown="SHUTDOWN">
+
+    <Service className="org.wso2.carbon.tomcat.ext.service.ExtendedStandardService" name="Catalina">
+
+        <!--
+        optional attributes:
+
+        proxyPort="80"
+        -->
+        <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
+                   port="9763"
+                   redirectPort="9443"
+                   bindOnInit="false"
+                   maxHttpHeaderSize="8192"
+                   acceptorThreadCount="2"
+                   maxThreads="250"
+                   minSpareThreads="50"
+                   disableUploadTimeout="false"
+                   connectionUploadTimeout="120000"
+                   maxKeepAliveRequests="200"
+                   acceptCount="200"
+                   server="WSO2 Carbon Server"
+                   compression="on"
+                   compressionMinSize="2048"
+                   noCompressionUserAgents="gozilla, traviata"
+                   compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
+                   URIEncoding="UTF-8"/>
+
+        <!--
+        optional attributes:
+
+        proxyPort="443"
+        Added sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2" for poodle vulnerability fix
+        -->
+        <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
+                   port="9443"
+                   bindOnInit="false"
+                   sslProtocol="TLS"
+                   sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2"
+                   maxHttpHeaderSize="8192"
+                   acceptorThreadCount="2"
+                   maxThreads="250"
+                   minSpareThreads="50"
+                   disableUploadTimeout="false"
+                   enableLookups="false"
+                   connectionUploadTimeout="120000"
+                   maxKeepAliveRequests="200"
+                   acceptCount="200"
+                   server="WSO2 Carbon Server"
+                   clientAuth="want"
+                   compression="on"
+                   scheme="https"
+                   secure="true"
+                   SSLEnabled="true"
+                   compressionMinSize="2048"
+                   noCompressionUserAgents="gozilla, traviata"
+                   compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
+                   keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.jks"
+                   keystorePass="wso2carbon"
+                   URIEncoding="UTF-8"/>
+
+
+        <Engine name="Catalina" defaultHost="localhost">
+
+            <!--Realm className="org.apache.catalina.realm.MemoryRealm" pathname="${carbon.home}/repository/conf/tomcat/tomcat-users.xml"/-->
+
+            <Realm className="org.wso2.carbon.tomcat.ext.realms.CarbonTomcatRealm"/>
+
+            <Host name="localhost" unpackWARs="true" deployOnStartup="false" autoDeploy="false"
+                  appBase="${carbon.home}/repository/deployment/server/webapps/">
+                <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonContextCreatorValve"/>
+                <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${carbon.home}/repository/logs"
+                       prefix="http_access_" suffix=".log"
+                       pattern="combined"/>
+                <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonStuckThreadDetectionValve" threshold="600"/>
+                <Valve className="org.wso2.carbon.tomcat.ext.valves.CompositeValve"/>
+            </Host>
+        </Engine>
+    </Service>
+</Server>
+
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index 715c17ad..fecb8059 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -395,6 +395,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
+								</featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -806,6 +809,10 @@
                                     <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.identity.authenticator.mutualssl.feature.group</id>
+									<version>${identity.carbon.auth.mutual.ssl.version}</version>
+								</feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index c7ec011b..689b8b00 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -73,7 +73,8 @@
                 <exclude>**/lib/httpmime*</exclude>
                 <exclude>**/lib/encoder*</exclude>
                 <exclude>**/plugins/jaxb*</exclude>
-                <exclude>**/security/authenticators.xml</exclude>
+                <exclude>**/repository/conf/security/authenticators.xml</exclude>
+				<exclude>**/repository/conf/tomcat/catalina-server.xml</exclude>
 				<exclude>**/user-mgt.xml</exclude>
 
                 <exclude>**/plugins/org.wso2.carbon.localentry.ui*</exclude>
@@ -407,7 +408,7 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
             </outputDirectory>
         </fileSet>
-        <fileSet>
+		<fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
             </directory>
@@ -1186,6 +1187,12 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+		<file>
+			<source>src/repository/conf/tomcat/catalina-server.xml</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
+			<filtered>true</filtered>
+			<fileMode>644</fileMode>
+		</file>
         <!-- Cipher Tool Files -->
         <file>
             <source>
@@ -1320,9 +1327,9 @@
         <!-- Adding IoT Analytics Dashboard and gadget CApps -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/devicetypes/device_management/org_wso2_carbon_analytics_cdmf-1.0.0.car
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/device_management/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!-- Copying webapp-publisher-config.xml -->
diff --git a/modules/core/distribution/src/repository/bin/wso2server.bat b/modules/core/distribution/src/repository/bin/wso2server.bat
index 33cd68cf..6a5b22e8 100644
--- a/modules/core/distribution/src/repository/bin/wso2server.bat
+++ b/modules/core/distribution/src/repository/bin/wso2server.bat
@@ -162,7 +162,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
 
 set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 
-set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Core" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="8243"
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Core" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9445" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="8243"
 
 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%
diff --git a/modules/core/distribution/src/repository/bin/wso2server.sh b/modules/core/distribution/src/repository/bin/wso2server.sh
index fc7c8894..329a6ecf 100755
--- a/modules/core/distribution/src/repository/bin/wso2server.sh
+++ b/modules/core/distribution/src/repository/bin/wso2server.sh
@@ -309,6 +309,8 @@ do
     -Dorg.opensaml.httpclient.https.disableHostnameVerification=true \
     -Diot.analytics.host="localhost" \
     -Diot.analytics.https.port="9445" \
+    -Diot.manager.host="localhost" \
+    -Diot.manager.https.port="9443" \
     -Dmqtt.broker.host="localhost" \
     -Dmqtt.broker.port="1886" \
     -Diot.core.host="localhost" \
diff --git a/modules/core/distribution/src/repository/conf/security/authenticators.xml b/modules/core/distribution/src/repository/conf/security/authenticators.xml
index 4c227fe9..4063c7e6 100644
--- a/modules/core/distribution/src/repository/conf/security/authenticators.xml
+++ b/modules/core/distribution/src/repository/conf/security/authenticators.xml
@@ -40,7 +40,17 @@
         <Priority>5</Priority>
     </Authenticator>
 
-    <!-- authenticator Configurations for SAML2SSOAuthenticator -->
+	<!-- Authenticator Configurations for MutualSSLAuthenticator -->
+	<Authenticator name="MutualSSLAuthenticator" disabled="false">
+		<Priority>5</Priority>
+		<Config>
+			<Parameter name="UsernameHeader">UserName</Parameter>
+			<Parameter name="WhiteListEnabled">false</Parameter>
+			<Parameter name="WhiteList"/>
+		</Config>
+	</Authenticator>
+
+	<!-- authenticator Configurations for SAML2SSOAuthenticator -->
     <Authenticator name="SAML2SSOAuthenticator" disabled="true">
         <Priority>10</Priority>
         <Config>
diff --git a/modules/core/distribution/src/repository/conf/tomcat/catalina-server.xml b/modules/core/distribution/src/repository/conf/tomcat/catalina-server.xml
new file mode 100644
index 00000000..c68a93ef
--- /dev/null
+++ b/modules/core/distribution/src/repository/conf/tomcat/catalina-server.xml
@@ -0,0 +1,99 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<Server port="8005" shutdown="SHUTDOWN">
+
+    <Service className="org.wso2.carbon.tomcat.ext.service.ExtendedStandardService" name="Catalina">
+
+        <!--
+        optional attributes:
+
+        proxyPort="80"
+        -->
+        <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
+                   port="9763"
+                   redirectPort="9443"
+                   bindOnInit="false"
+                   maxHttpHeaderSize="8192"
+                   acceptorThreadCount="2"
+                   maxThreads="250"
+                   minSpareThreads="50"
+                   disableUploadTimeout="false"
+                   connectionUploadTimeout="120000"
+                   maxKeepAliveRequests="200"
+                   acceptCount="200"
+                   server="WSO2 Carbon Server"
+                   compression="on"
+                   compressionMinSize="2048"
+                   noCompressionUserAgents="gozilla, traviata"
+                   compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
+                   URIEncoding="UTF-8"/>
+
+        <!--
+        optional attributes:
+
+        proxyPort="443"
+        Added sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2" for poodle vulnerability fix
+        -->
+        <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
+                   port="9443"
+                   bindOnInit="false"
+                   sslProtocol="TLS"
+                   sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2"
+                   maxHttpHeaderSize="8192"
+                   acceptorThreadCount="2"
+                   maxThreads="250"
+                   minSpareThreads="50"
+                   disableUploadTimeout="false"
+                   enableLookups="false"
+                   connectionUploadTimeout="120000"
+                   maxKeepAliveRequests="200"
+                   acceptCount="200"
+                   server="WSO2 Carbon Server"
+                   clientAuth="want"
+                   compression="on"
+                   scheme="https"
+                   secure="true"
+                   SSLEnabled="true"
+                   compressionMinSize="2048"
+                   noCompressionUserAgents="gozilla, traviata"
+                   compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
+                   keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.jks"
+                   keystorePass="wso2carbon"
+                   URIEncoding="UTF-8"/>
+
+
+        <Engine name="Catalina" defaultHost="localhost">
+
+            <!--Realm className="org.apache.catalina.realm.MemoryRealm" pathname="${carbon.home}/repository/conf/tomcat/tomcat-users.xml"/-->
+
+            <Realm className="org.wso2.carbon.tomcat.ext.realms.CarbonTomcatRealm"/>
+
+            <Host name="localhost" unpackWARs="true" deployOnStartup="false" autoDeploy="false"
+                  appBase="${carbon.home}/repository/deployment/server/webapps/">
+                <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonContextCreatorValve"/>
+                <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${carbon.home}/repository/logs"
+                       prefix="http_access_" suffix=".log"
+                       pattern="combined"/>
+                <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonStuckThreadDetectionValve" threshold="600"/>
+                <Valve className="org.wso2.carbon.tomcat.ext.valves.CompositeValve"/>
+            </Host>
+        </Engine>
+    </Service>
+</Server>
+
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 8897532b..c8c15301 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -730,6 +730,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
                                 </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
+								</featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1564,6 +1567,10 @@
                                     <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
                                     <version>${cdmf.analytics.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.identity.authenticator.mutualssl.feature.group</id>
+									<version>${identity.carbon.auth.mutual.ssl.version}</version>
+								</feature>
                             </features>
                         </configuration>
                     </execution>
@@ -3810,6 +3817,10 @@
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
 								<!-- End of Dashboard Features -->
+								<feature>
+									<id>org.wso2.carbon.identity.authenticator.mutualssl.feature.group</id>
+									<version>${identity.carbon.auth.mutual.ssl.version}</version>
+								</feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index f0142183..4c921de1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1676,7 +1676,7 @@
         <eclipse.paho.version>1.0.2</eclipse.paho.version>
 
         <!-- CDMF Analytics -->
-        <cdmf.analytics.version>1.0.3</cdmf.analytics.version>
+        <cdmf.analytics.version>1.0.4-SNAPSHOT</cdmf.analytics.version>
     </properties>
 
     <scm>