diff --git a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-catalina.properties b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-catalina.properties
index 79391baf22..59defe5d9d 100644
--- a/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-catalina.properties
+++ b/deliverytiersuite/delivery-tier-suite/delivery-tier-distribution/src/main/conf/perc/perc-catalina.properties
@@ -61,7 +61,7 @@ https.keystoreFile=conf/.keystore
https.keystorePass=changeit
https.keyAlias=tomcat
https.keystoreType=JKS
-https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
https.clientAuth=false
https.compressibleMimeType=text/html,txt/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml
https.compression=on
diff --git a/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Deployment/Server/conf/perc/perc-catalina.properties b/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Deployment/Server/conf/perc/perc-catalina.properties
index fe9c0b93f7..ce844da863 100644
--- a/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Deployment/Server/conf/perc/perc-catalina.properties
+++ b/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Deployment/Server/conf/perc/perc-catalina.properties
@@ -22,7 +22,7 @@ https.port=28443
http.rejectIllegalHeader=false
https.useKeepAliveResponseHeader=true
http.useBodyEncodingForURI=false
-https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
https.keystoreFile=conf/A.keystore
https.useBodyEncodingForURI=false
https.clientAuth=false
diff --git a/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Staging/Deployment/Server/conf/perc/perc-catalina.properties b/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Staging/Deployment/Server/conf/perc/perc-catalina.properties
index 22d7f781ca..9cd44e7e26 100644
--- a/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Staging/Deployment/Server/conf/perc/perc-catalina.properties
+++ b/modules/perc-ant/src/test/resources/com/percussion/ant/install/mockinstall/Staging/Deployment/Server/conf/perc/perc-catalina.properties
@@ -23,7 +23,7 @@ https.port=29443
http.rejectIllegalHeader=false
https.useKeepAliveResponseHeader=true
http.useBodyEncodingForURI=false
-https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+https.ciphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
https.keystoreFile=conf/A.keystore
https.useBodyEncodingForURI=false
https.clientAuth=false
diff --git a/modules/perc-distribution-tree/src/main/resources/distribution/rxconfig/Installer/updateConfiguration.xml b/modules/perc-distribution-tree/src/main/resources/distribution/rxconfig/Installer/updateConfiguration.xml
index e112415cfa..1cd51c4b17 100644
--- a/modules/perc-distribution-tree/src/main/resources/distribution/rxconfig/Installer/updateConfiguration.xml
+++ b/modules/perc-distribution-tree/src/main/resources/distribution/rxconfig/Installer/updateConfiguration.xml
@@ -232,6 +232,10 @@
+
+
+
+
diff --git a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java
index ed1363bc2c..7b5fb2be79 100644
--- a/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java
+++ b/projects/sitemanage/src/main/java/com/percussion/sitemanage/importer/utils/PSFileDownLoadJobRunner.java
@@ -144,6 +144,12 @@ public List> downloadFile(String url, String destination
URI uri = new URI(url);
URL fileUrl = uri.toURL();
+ //If the destination and the source are the same then skipping file creation as they are external resources.
+ if(url.equals(destinationPath)){
+ PSPair result = new PSPair<>(false, "Skipping creation of external resource : "+destinationPath);
+ localResults.add(result);
+ return localResults;
+ }
File file = new File(destinationPath);
if (doesFileExist(file))
diff --git a/system/config/Default/server.properties b/system/config/Default/server.properties
index 845ca5e5df..8c3e8a411a 100644
--- a/system/config/Default/server.properties
+++ b/system/config/Default/server.properties
@@ -44,7 +44,7 @@ xContentTypeOptions=nosniff
cacheControlRequired=true
cacheControl=no-cache\='Set-Cookie, Set-Cookie2',must-revalidate
autotuneCachePercentage=40
-enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
optimizePublishWithChecksum =false
publicCmsHostname=
requestBehindProxy=false
diff --git a/system/config/server.properties b/system/config/server.properties
index c8dd30a0bf..0530f6cd5b 100644
--- a/system/config/server.properties
+++ b/system/config/server.properties
@@ -426,7 +426,7 @@ autotuneCachePercentage=60
###################################################
# Enabled TLS Ciphers
##################################################
-enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DH_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
+enabledCiphers=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384
#################################################################
# Sets the value of the public host name to use when generating links to
# content in the CMS. If using a proxy in front of the CMS, this should