diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index ac35f977..532763ce 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -50,7 +50,6 @@
 				<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>
@@ -415,12 +414,6 @@
 			<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 -->
diff --git a/modules/analytics/distribution/src/repository/conf/security/authenticators.xml b/modules/analytics/distribution/src/repository/conf/security/authenticators.xml
index 7fb33e27..2afca49f 100644
--- a/modules/analytics/distribution/src/repository/conf/security/authenticators.xml
+++ b/modules/analytics/distribution/src/repository/conf/security/authenticators.xml
@@ -61,14 +61,18 @@
 			</SkipSessionValidation> -->
 	</Authenticator>
 
+	<Authenticator name="SignedJWTAuthenticator" disabled="false">
+		<Priority>5</Priority>
+	</Authenticator>
+
 	<!-- Authenticator Configurations for MutualSSLAuthenticator -->
-	<Authenticator name="MutualSSLAuthenticator" disabled="false">
+	<!--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-->
 
 </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
deleted file mode 100644
index c68a93ef..00000000
--- a/modules/analytics/distribution/src/repository/conf/tomcat/catalina-server.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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 fecb8059..b245368b 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -809,10 +809,6 @@
                                     <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 689b8b00..78690354 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -74,7 +74,6 @@
                 <exclude>**/lib/encoder*</exclude>
                 <exclude>**/plugins/jaxb*</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>
@@ -1187,12 +1186,6 @@
             <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>
diff --git a/modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
index 62cb1c57..1558b672 100644
--- a/modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
+++ b/modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
@@ -476,6 +476,7 @@ org.owasp.csrfguard.unprotected.socialAcs=%servletContext%/social/acs
 org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis
 org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/*
 org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/*
+org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/*
 
  
 #carbon
diff --git a/modules/core/distribution/src/repository/conf/security/authenticators.xml b/modules/core/distribution/src/repository/conf/security/authenticators.xml
index 4063c7e6..4b8e8fb8 100644
--- a/modules/core/distribution/src/repository/conf/security/authenticators.xml
+++ b/modules/core/distribution/src/repository/conf/security/authenticators.xml
@@ -25,15 +25,18 @@
 <Authenticators xmlns="http://wso2.org/projects/carbon/authenticators.xml">
 
     <!-- authenticator Configurations for OAuthAuthenticator -->
-    <Authenticator name="OAuthAuthenticator" disabled="false">
-        <Priority>10</Priority>
-        <Config>
-            <Parameter name="isRemote">false</Parameter>
-            <Parameter name="hostURL">https://localhost:9443</Parameter>
-            <Parameter name="adminUsername">admin</Parameter>
-            <Parameter name="adminPassword">admin</Parameter>
-        </Config>
-    </Authenticator>
+	<Authenticator name="SignedJWTAuthenticator" disabled="false">
+		<Priority>5</Priority>
+	</Authenticator>
+	<Authenticator name="OAuthAuthenticator" disabled="true">
+		<Priority>10</Priority>
+		<Config>
+			<Parameter name="isRemote">false</Parameter>
+			<Parameter name="hostURL">https://localhost:9443</Parameter>
+			<Parameter name="adminUsername">admin</Parameter>
+			<Parameter name="adminPassword">admin</Parameter>
+		</Config>
+	</Authenticator>
 
     <!-- authenticator Configurations for TokenUIAuthenticator -->
     <Authenticator name="TokenUIAuthenticator" disabled="false">
@@ -41,14 +44,14 @@
     </Authenticator>
 
 	<!-- Authenticator Configurations for MutualSSLAuthenticator -->
-	<Authenticator name="MutualSSLAuthenticator" disabled="false">
+	<!--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-->
 
 	<!-- authenticator Configurations for SAML2SSOAuthenticator -->
     <Authenticator name="SAML2SSOAuthenticator" disabled="true">
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index c8c15301..0b491eaf 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -857,10 +857,6 @@
                                     <id>org.wso2.carbon.appmgt.core.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.store.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -881,6 +877,10 @@
                                     <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.store.feature.group</id>
+									<version>${carbon.store.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.store.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -2503,32 +2503,44 @@
                                 </feature>
                                 <!-- End of IoTServer Features -->
 
-                                <!-- App management features-->
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <!-- End of app management features-->
+								<!-- App management features-->
+								<feature>
+									<id>org.wso2.carbon.appmgt.core.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.publisher.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.store.feature.group</id>
+									<version>${carbon.store.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.store.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.social.feature.group</id>
+									<version>${carbon.store.version}</version>
+								</feature>
+								<!-- End of app management features-->
 
 								<!-- Dashboard Features -->
 								<feature>
@@ -3189,32 +3201,44 @@
                                 </feature>
                                 <!-- End of IoTServer Features -->
 
-                                <!-- App management features-->
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <!-- End of app management features-->
+								<!-- App management features-->
+								<feature>
+									<id>org.wso2.carbon.appmgt.core.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.publisher.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.store.feature.group</id>
+									<version>${carbon.store.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.store.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.social.feature.group</id>
+									<version>${carbon.store.version}</version>
+								</feature>
+								<!-- End of app management features-->
 
                                 <!-- Device Management Features -->
                                 <feature>
@@ -3816,11 +3840,6 @@
 									<id>org.wso2.carbon.iot.device.statistics.dashboard.feature.group</id>
 									<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>