diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
index 806b42538a..1b6b1741cc 100644
--- a/Dockerfile.tomcat
+++ b/Dockerfile.tomcat
@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.5.1-ESB-1170-PR-37-BB-release-2F-7.5
+FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.5.1
 ARG VERSION
 
 ### Required OpenShift Labels
diff --git a/keycloak-plugin/keycloak/docker-compose.yml b/keycloak-plugin/keycloak/docker-compose.yml
index e984aee710..6d6f1d0330 100644
--- a/keycloak-plugin/keycloak/docker-compose.yml
+++ b/keycloak-plugin/keycloak/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   keycloak-dev:
-    image: entando/entando-keycloak:v7.3.1-fix.3
+    image: entando/entando-keycloak:v7.5.0
     container_name: dev-docker-keycloak24
     ports:
       - "127.0.0.1:9080:8080"
diff --git a/webapp/upgrade/4.3.2-to-6.3.2/mysql/port.sql b/webapp/upgrade/4.3.2-to-6.3.2/mysql/port.sql
new file mode 100644
index 0000000000..3663e22667
--- /dev/null
+++ b/webapp/upgrade/4.3.2-to-6.3.2/mysql/port.sql
@@ -0,0 +1,204 @@
+-- Script for upgrading MySQL port database from Entando 4.3.2 to 6.3.2
+-- Not a final target: continue with 6.3.2-to-7.0.0/mysql/port.sql to reach 7.0.0.
+--
+-- NOTE: the CLOB/XML statements marked below (contents.sync comparison, contents.published
+-- extraction) use MySQL-specific functions and should be verified before running.
+
+-- ************* To 5.0.0 *************
+
+ALTER TABLE pages_metadata_draft ADD COLUMN groupcode VARCHAR(30);
+ALTER TABLE pages_metadata_online ADD COLUMN groupcode VARCHAR(30);
+UPDATE pages_metadata_online o SET groupcode = (SELECT p.groupcode FROM pages p WHERE o.code = p.code);
+UPDATE pages_metadata_draft d SET groupcode = (SELECT p.groupcode FROM pages p WHERE d.code = p.code);
+ALTER TABLE pages DROP COLUMN groupcode;
+
+INSERT INTO sysconfig (version, item, descr, config) VALUES ('production', 'jacms_resourceMetadataMapping', 'Mapping between resource Metadata and resource attribute fields', '<mapping>
+    <field key="alt"></field>
+    <field key="description"></field>
+    <field key="legend"></field>
+    <field key="title"></field>
+</mapping>');
+
+-- ************* To 5.3.2 *************
+
+ALTER TABLE resources ADD COLUMN owner VARCHAR(128);
+
+ALTER TABLE contents ADD COLUMN sync SMALLINT;
+UPDATE contents SET sync = 1 WHERE workxml = onlinexml;
+UPDATE contents SET sync = 0 WHERE workxml <> onlinexml AND onlinexml IS NOT NULL;
+UPDATE contents SET sync = 0 WHERE onlinexml IS NULL;
+
+ALTER TABLE contents ADD COLUMN published VARCHAR(20);
+-- NOTE: extracts /root/lastModified from the online content XML (MySQL ExtractValue)
+UPDATE contents SET published = ExtractValue(onlinexml, '/*/lastModified') WHERE onlinexml IS NOT NULL;
+
+CREATE INDEX contents_sync_idx ON contents (sync);
+
+-- ************* To 6.2.0 *************
+
+ALTER TABLE contents ADD COLUMN restriction VARCHAR(40);
+
+ALTER TABLE resources ADD COLUMN folderpath VARCHAR(256);
+
+ALTER TABLE widgetcatalog ADD COLUMN bundleid VARCHAR(150);
+ALTER TABLE widgetcatalog ADD COLUMN configui TEXT;
+
+CREATE TABLE jpseo_friendlycode (
+    friendlycode VARCHAR(256) NOT NULL,
+    pagecode VARCHAR(30),
+    contentid VARCHAR(16),
+    langcode VARCHAR(2),
+    CONSTRAINT jpseo_friendlycode_pkey PRIMARY KEY (friendlycode)
+);
+
+CREATE TABLE jpversioning_trashedresources (
+    resid VARCHAR(16) NOT NULL,
+    restype VARCHAR(30) NOT NULL,
+    descr VARCHAR(100) NOT NULL,
+    maingroup VARCHAR(20) NOT NULL,
+    resxml LONGTEXT NOT NULL,
+    CONSTRAINT jpversioning_trashedresources_pkey PRIMARY KEY (resid)
+);
+
+CREATE TABLE jpversioning_versionedcontents (
+    id INT NOT NULL,
+    contentid VARCHAR(16) NOT NULL,
+    contenttype VARCHAR(30) NOT NULL,
+    descr VARCHAR(255) NOT NULL,
+    status VARCHAR(12) NOT NULL,
+    contentxml LONGTEXT NOT NULL,
+    versiondate DATETIME NOT NULL,
+    versioncode VARCHAR(7) NOT NULL,
+    onlineversion INT NOT NULL,
+    approved SMALLINT NOT NULL,
+    username VARCHAR(40),
+    CONSTRAINT jpversioning_versionedcontents_pkey PRIMARY KEY (id),
+    CONSTRAINT jpvers_contentvers_key UNIQUE (contentid, versioncode)
+);
+
+INSERT INTO sysconfig (version, item, descr, config) VALUES ('production', 'jpmail_config', 'Configurazione del servizio di invio eMail', '<?xml version="1.0" encoding="UTF-8"?>
+<mailConfig>
+	<senders>
+		<sender code="CODE1">EMAIL1@EMAIL.COM</sender>
+		<sender code="CODE2">EMAIL2@EMAIL.COM</sender>
+	</senders>
+	<smtp debug="false">
+		<host>localhost</host>
+		<port>25000</port>
+		<user></user>
+		<password></password>
+		<security>std</security>
+	</smtp>
+</mailConfig>');
+
+INSERT INTO sysconfig (version, item, descr, config) VALUES ('production', 'cthread_config', 'Configurazione thread pubblicazione/sospensione automatica', '<contentThreadconfig sitecode="A">
+<!--attiva o disattiva lo scheduler.
+I valori da assegnare all attributo active possono essere true o false
+ se il valore settato è true , lo scheduler è attivo
+ se il valore settato è false , lo scheduler non è attivo
+-->
+<scheduler active="true"/>
+<!--categoria globale a cui verranno associati i contenuti in fase di depubblicazione o sospensione del contenuto.
+In corrispondenza della voce="code" va messo il codice della categoria;
+è obbligatorio mettere questa categoria in quanto verrà utilizzata per lo spostamento dei contenuti 
+nell archivio online in mancanza di categorie specifiche -->    
+<globalcat code="archive"/> 
+<!--contenuto e modello di contenuto sostitutivo globale, verrà utilizzato nel caso in cui non vi sia specificato 
+l idContentReplace e il modelIdContentReplace nel tag contentType.
+    nell attributo contentId = deve essere inserito l id del contenuto sostitutivo es. ART1226933
+    nell attributo modelId = deve essere inserito l id del modello del contenuto sostitutivo   es. 12
+   La definizione di questo contenuto sostitutivo globale è obbligatoria
+-->   
+<contentReplace contentId="ART1226933" modelId="12"/> 
+<contentTypes>
+<!--
+startAttr: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificata la data di pubblicazione.(obbligatorio)
+endAttr: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificata la data di sospensione.(obbligatorio)
+idContentReplace: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificato l id del contenuto da sostituire(opzionale)
+modelIdContentReplace: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificato il modelid del contenuto da sostituire(opzionale)
+Nel caso in cui non vengano valorizzati idContentReplace e modelIdContentReplace, verrà utilizzato il contenuto sostitutivo globale definito precedentemente
+
+Suspend: l attributo suspend è obbligatorio ed è necessario per definire l azione da svolgere(valori possono essere true o false)
+- se è settato a true,  predispone la sospensione dei contenuti per la tipologia di contenuti in cui è settato
+- se è settato a false, predispone lo  spostamento nell archivio online dei contenuti della tipologia di contenuto in cui è settato 
+-->
+        <contentType type="NOL" startAttr="Data_inizio" endAttr="Data_fine" idContentReplace="Id_contenuto_sost" modelIdContentReplace="Model_id" suspend="true">
+                <!--categorie associate al tipo di contenuto e che verranno associate ai contenuti 
+                in fase di depubblicazione o sospensione 
+                nell attributo code deve essere specificato il codice della categoria-->
+    <!--<category code="cnol_canale7" />
+    <category code="cnol_canale3" />
+    <category code="cnol_canale4" />
+    <category code="cnol_canale5" />
+    <category code="cnol_canale2" />
+    <category code="cnol_canale1" />
+    <category code="cnol_canale6" />
+    <category code="cnol_canale8" /> -->
+        </contentType>
+<contentType type="DRT" startAttr="Data_inizio" endAttr="Data_fine" suspend="true" >
+         <!--categorie associate al tipo di contenuto e che verranno associate ai contenuti in fase di depubblicazione o sospensione 
+                nell attributo code deve essere specificato il codice della categoria-->
+    <!--<category code="pubb_drt" />
+    <category code="cnol_canale8" /> -->
+   </contentType>
+  <contentType type="SNT" startAttr="Data_inizio" endAttr="Data_fine" suspend="true" >
+        <!--non essendoci categorie associate, ai contenuti di questo tipo verrà associata la categoria globale -->
+   </contentType>
+</contentTypes>
+
+<!-- i gruppi attualmente non vengono usati-->
+<groups> 
+          <group id="gruppoDiProvaThread" contentType="NOL" /> 
+</groups>
+  
+<!-- utenti che riceveranno le comunicazioni sull andamento delle operazioni di pubblicazione, sospensione e spostamento -->
+<users>
+  <user username="admin" contentType="*" />
+</users>
+
+
+<!-- template della mail di comunicazione-->
+<mail alsoHtml="false" senderCode="CODE1" mailAttrName="email" >    
+<subject><![CDATA[Report pubblicazione/sospensione automatica]]></subject>     
+ <htmlHeader><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="it">  <head> </head>  <body><div style="padding:1.5em;font-family:Arial, sans serif; color: #333333;font-size:0.9em">Report  Pubblicazione/Sospensione automatica contenuti<br/><p>Contenuti pubblicati:</p>]]></htmlHeader> 
+     <htmlFooter><![CDATA[<br /><br />Cordiali Saluti<br/></div></body></html>]]> </htmlFooter>       
+<htmlSeparator> <![CDATA[ <br /> Contenuti sospesi: ]]> </htmlSeparator>     
+ <textHeader><![CDATA[Report pubblicazione/sospensione automatica]]> </textHeader>  
+<textFooter><![CDATA[   Cordiali Saluti.]]> </textFooter>      
+<textSeparator><![CDATA[
+
+Contenuti sospesi:
+ ]]></textSeparator>  
+
+<htmlSeparatorMove> <![CDATA[ <br /> Contenuti spostati in archivio online: ]]> </htmlSeparatorMove> 
+ <textHeaderMove><![CDATA[Report pubblicazione/sospensione automatica]]> </textHeaderMove>  
+<textFooterMove><![CDATA[   Cordiali Saluti.]]> </textFooterMove>  
+<textSeparatorMove><![CDATA[
+
+Contenuti spostati in archivio online:
+ ]]></textSeparatorMove>   
+
+</mail> </contentThreadconfig>');
+
+-- ************* To 6.3.2 *************
+
+CREATE TABLE userpreferences
+(
+    username VARCHAR(80) NOT NULL,
+    wizard SMALLINT NOT NULL,
+    loadonpageselect SMALLINT NOT NULL,
+    translationwarning SMALLINT NOT NULL,
+    defaultpageownergroup VARCHAR(64),
+    defaultpagejoingroups VARCHAR(256),
+    defaultcontentownergroup VARCHAR(64),
+    defaultcontentjoingroups VARCHAR(256),
+    defaultwidgetownergroup VARCHAR(64),
+    defaultwidgetjoingroups VARCHAR(256),
+    CONSTRAINT userpreferences_pkey PRIMARY KEY (username)
+);
+
+ALTER TABLE resources ADD COLUMN correlationcode VARCHAR(256);
+
+ALTER TABLE widgetcatalog ADD COLUMN readonlypagewidgetconfig SMALLINT;
+ALTER TABLE widgetcatalog ADD COLUMN widgetcategory VARCHAR(80);
+ALTER TABLE widgetcatalog ADD COLUMN icon VARCHAR(80);
diff --git a/webapp/upgrade/4.3.2-to-6.3.2/mysql/serv.sql b/webapp/upgrade/4.3.2-to-6.3.2/mysql/serv.sql
new file mode 100644
index 0000000000..a85f0fc942
--- /dev/null
+++ b/webapp/upgrade/4.3.2-to-6.3.2/mysql/serv.sql
@@ -0,0 +1,31 @@
+-- Script for upgrading MySQL serv database from Entando 4.3.2 to 6.3.2
+-- Not a final target: continue with 6.3.2-to-7.0.0/mysql/serv.sql to reach 7.0.0.
+
+-- ************* To 5.0.0 *************
+-- Nothing to do
+
+-- ************* To 5.3.2 *************
+-- Nothing to do
+
+-- ************* To 6.2.0 *************
+
+ALTER TABLE authusers MODIFY COLUMN username VARCHAR(80);
+ALTER TABLE authusergrouprole MODIFY COLUMN username VARCHAR(80);
+
+ALTER TABLE authuserprofileattrroles DROP FOREIGN KEY authuserprofileattrroles_fkey;
+ALTER TABLE authuserprofilesearch DROP FOREIGN KEY authuserprofilesearch_fkey;
+
+ALTER TABLE authuserprofiles MODIFY COLUMN username VARCHAR(80);
+ALTER TABLE authuserprofileattrroles MODIFY COLUMN username VARCHAR(80);
+ALTER TABLE authuserprofilesearch MODIFY COLUMN username VARCHAR(80);
+
+ALTER TABLE authuserprofileattrroles ADD CONSTRAINT authuserprofileattrroles_fkey FOREIGN KEY (username) REFERENCES authuserprofiles(username);
+ALTER TABLE authuserprofilesearch ADD CONSTRAINT authuserprofilesearch_fkey FOREIGN KEY (username) REFERENCES authuserprofiles(username);
+
+ALTER TABLE authusershortcuts MODIFY COLUMN username VARCHAR(80);
+
+ALTER TABLE actionlogrecords MODIFY COLUMN username VARCHAR(80);
+ALTER TABLE actionlogrecords MODIFY COLUMN actionname VARCHAR(250);
+
+-- ************* To 6.3.2 *************
+-- Nothing to do
\ No newline at end of file
diff --git a/webapp/upgrade/4.3.2-to-6.3.2/oracle/port.sql b/webapp/upgrade/4.3.2-to-6.3.2/oracle/port.sql
new file mode 100644
index 0000000000..2274471ad4
--- /dev/null
+++ b/webapp/upgrade/4.3.2-to-6.3.2/oracle/port.sql
@@ -0,0 +1,207 @@
+-- Script for upgrading Oracle port database from Entando 4.3.2 to 6.3.2
+-- Not a final target: continue with 6.3.2-to-7.0.0/oracle/port.sql to reach 7.0.0.
+--
+-- NOTE: the CLOB/XML statements marked below (contents.sync comparison via DBMS_LOB.COMPARE,
+-- contents.published extraction via EXTRACTVALUE, and the cthread_config CLOB assembled with
+-- TO_CLOB because the value exceeds the 4000-char literal limit) use Oracle-specific
+-- constructs and should be verified before running.
+
+-- ************* To 5.0.0 *************
+
+ALTER TABLE pages_metadata_draft ADD (groupcode character varying(30));
+ALTER TABLE pages_metadata_online ADD (groupcode character varying(30));
+UPDATE pages_metadata_online o SET groupcode = (SELECT p.groupcode FROM pages p WHERE o.code = p.code);
+UPDATE pages_metadata_draft d SET groupcode = (SELECT p.groupcode FROM pages p WHERE d.code = p.code);
+ALTER TABLE pages DROP COLUMN groupcode;
+
+INSERT INTO sysconfig (version, item, descr, config) VALUES ('production', 'jacms_resourceMetadataMapping', 'Mapping between resource Metadata and resource attribute fields', '<mapping>
+    <field key="alt"></field>
+    <field key="description"></field>
+    <field key="legend"></field>
+    <field key="title"></field>
+</mapping>');
+
+-- ************* To 5.3.2 *************
+
+ALTER TABLE resources ADD (owner character varying(128));
+
+ALTER TABLE contents ADD (sync smallint);
+-- NOTE: CLOB columns cannot be compared with '='; DBMS_LOB.COMPARE returns 0 when equal
+UPDATE contents SET sync = 1 WHERE DBMS_LOB.COMPARE(workxml, onlinexml) = 0;
+UPDATE contents SET sync = 0 WHERE DBMS_LOB.COMPARE(workxml, onlinexml) <> 0 AND onlinexml IS NOT NULL;
+UPDATE contents SET sync = 0 WHERE onlinexml IS NULL;
+
+ALTER TABLE contents ADD (published character varying(20));
+-- NOTE: extracts /root/lastModified from the online content XML (Oracle EXTRACTVALUE)
+UPDATE contents SET published = EXTRACTVALUE(XMLType(onlinexml), '/*/lastModified') WHERE onlinexml IS NOT NULL;
+
+CREATE INDEX contents_sync_idx ON contents (sync);
+
+-- ************* To 6.2.0 *************
+
+ALTER TABLE contents ADD (restriction character varying(40));
+ALTER TABLE resources ADD (folderpath character varying(256));
+ALTER TABLE widgetcatalog ADD (bundleid character varying(150));
+ALTER TABLE widgetcatalog ADD (configui CLOB);
+
+CREATE TABLE jpseo_friendlycode (
+    friendlycode character varying(256) NOT NULL,
+    pagecode character varying(30),
+    contentid character varying(16),
+    langcode character varying(2),
+    CONSTRAINT jpseo_friendlycode_pkey PRIMARY KEY (friendlycode)
+);
+
+CREATE TABLE jpversioning_trashedresources (
+    resid character varying(16) NOT NULL,
+    restype character varying(30) NOT NULL,
+    descr character varying(100) NOT NULL,
+    maingroup character varying(20) NOT NULL,
+    resxml CLOB NOT NULL,
+    CONSTRAINT jpversioning_trashedresources_pkey PRIMARY KEY (resid)
+);
+
+CREATE TABLE jpversioning_versionedcontents (
+    id integer NOT NULL,
+    contentid character varying(16) NOT NULL,
+    contenttype character varying(30) NOT NULL,
+    descr character varying(255) NOT NULL,
+    status character varying(12) NOT NULL,
+    contentxml CLOB NOT NULL,
+    versiondate timestamp NOT NULL,
+    versioncode character varying(7) NOT NULL,
+    onlineversion integer NOT NULL,
+    approved smallint NOT NULL,
+    username character varying(40),
+    CONSTRAINT jpversioning_versionedcontents_pkey PRIMARY KEY (id),
+    CONSTRAINT jpvers_contentvers_key UNIQUE (contentid, versioncode)
+);
+
+INSERT INTO sysconfig (version, item, descr, config) VALUES ('production', 'jpmail_config', 'Configurazione del servizio di invio eMail', '<?xml version="1.0" encoding="UTF-8"?>
+<mailConfig>
+	<senders>
+		<sender code="CODE1">EMAIL1@EMAIL.COM</sender>
+		<sender code="CODE2">EMAIL2@EMAIL.COM</sender>
+	</senders>
+	<smtp debug="false">
+		<host>localhost</host>
+		<port>25000</port>
+		<user></user>
+		<password></password>
+		<security>std</security>
+	</smtp>
+</mailConfig>');
+
+INSERT INTO sysconfig (version, item, descr, config) VALUES ('production', 'cthread_config', 'Configurazione thread pubblicazione/sospensione automatica',
+  TO_CLOB('<contentThreadconfig sitecode="A">
+<!--attiva o disattiva lo scheduler.
+I valori da assegnare all attributo active possono essere true o false
+ se il valore settato è true , lo scheduler è attivo
+ se il valore settato è false , lo scheduler non è attivo
+-->
+<scheduler active="true"/>
+<!--categoria globale a cui verranno associati i contenuti in fase di depubblicazione o sospensione del contenuto.
+In corrispondenza della voce="code" va messo il codice della categoria;
+è obbligatorio mettere questa categoria in quanto verrà utilizzata per lo spostamento dei contenuti 
+nell archivio online in mancanza di categorie specifiche -->    
+<globalcat code="archive"/> 
+<!--contenuto e modello di contenuto sostitutivo globale, verrà utilizzato nel caso in cui non vi sia specificato 
+l idContentReplace e il modelIdContentReplace nel tag contentType.
+    nell attributo contentId = deve essere inserito l id del contenuto sostitutivo es. ART1226933
+    nell attributo modelId = deve essere inserito l id del modello del contenuto sostitutivo   es. 12
+   La definizione di questo contenuto sostitutivo globale è obbligatoria
+-->   
+<contentReplace contentId="ART1226933" modelId="12"/> 
+<contentTypes>
+<!--
+startAttr: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificata la data di pubblicazione.(obbligatorio)
+endAttr: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificata la data di sospensione.(obbligatorio)
+idContentReplace: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificato l id del contenuto da sostituire(opzionale)
+modelIdContentReplace: quest attributo deve essere valorizzato con il nome del campo in cui sarà specificato il modelid del contenuto da sostituire(opzionale)
+Nel caso in cui non vengano valorizzati idContentReplace e modelIdContentReplace, verrà utilizzato il contenuto sostitutivo globale definito precedentemente
+
+Suspend: l attributo suspend è obbligatorio ed è necessario per definire l azione da svolgere(valori possono essere true o false)
+- se è settato a true,  predispone la sospensione dei contenuti per la tipologia di contenuti in cui è settato
+- se è settato a false, predispone lo  spostamento nell archivio online dei contenuti della tipologia di contenuto in cui è settato 
+-->
+        <contentType type="NOL" startAttr="Data_inizio" endAttr="Data_fine" idContentReplace="Id_contenuto_sost" modelIdContentReplace="Model_id" suspend="true">
+                <!--categorie associate al tipo di contenuto e che verranno associate ai contenuti 
+                in fase di depubblicazione o sospensione 
+                nell attributo code deve essere specificato il codice della categoria-->
+    <!--<category code="cnol_canale7" />
+    <category code="cnol_canale3" />
+    <category code="cnol_canale4" />
+    <category code="cnol_canale5" />
+    <category code="cnol_canale2" />
+    <category code="cnol_canale1" />
+    <category code="cnol_canale6" />
+') ||
+  TO_CLOB('    <category code="cnol_canale8" /> -->
+        </contentType>
+<contentType type="DRT" startAttr="Data_inizio" endAttr="Data_fine" suspend="true" >
+         <!--categorie associate al tipo di contenuto e che verranno associate ai contenuti in fase di depubblicazione o sospensione 
+                nell attributo code deve essere specificato il codice della categoria-->
+    <!--<category code="pubb_drt" />
+    <category code="cnol_canale8" /> -->
+   </contentType>
+  <contentType type="SNT" startAttr="Data_inizio" endAttr="Data_fine" suspend="true" >
+        <!--non essendoci categorie associate, ai contenuti di questo tipo verrà associata la categoria globale -->
+   </contentType>
+</contentTypes>
+
+<!-- i gruppi attualmente non vengono usati-->
+<groups> 
+          <group id="gruppoDiProvaThread" contentType="NOL" /> 
+</groups>
+  
+<!-- utenti che riceveranno le comunicazioni sull andamento delle operazioni di pubblicazione, sospensione e spostamento -->
+<users>
+  <user username="admin" contentType="*" />
+</users>
+
+
+<!-- template della mail di comunicazione-->
+<mail alsoHtml="false" senderCode="CODE1" mailAttrName="email" >    
+<subject><![CDATA[Report pubblicazione/sospensione automatica]]></subject>     
+ <htmlHeader><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="it">  <head> </head>  <body><div style="padding:1.5em;font-family:Arial, sans serif; color: #333333;font-size:0.9em">Report  Pubblicazione/Sospensione automatica contenuti<br/><p>Contenuti pubblicati:</p>]]></htmlHeader> 
+     <htmlFooter><![CDATA[<br /><br />Cordiali Saluti<br/></div></body></html>]]> </htmlFooter>       
+<htmlSeparator> <![CDATA[ <br /> Contenuti sospesi: ]]> </htmlSeparator>     
+ <textHeader><![CDATA[Report pubblicazione/sospensione automatica]]> </textHeader>  
+<textFooter><![CDATA[   Cordiali Saluti.]]> </textFooter>      
+<textSeparator><![CDATA[
+
+Contenuti sospesi:
+ ]]></textSeparator>  
+
+<htmlSeparatorMove> <![CDATA[ <br /> Contenuti spostati in archivio online: ]]> </htmlSeparatorMove> 
+ <textHeaderMove><![CDATA[Report pubblicazione/sospensione automatica]]> </textHeaderMove>  
+<textFooterMove><![CDATA[   Cordiali Saluti.]]> </textFooterMove>  
+<textSeparatorMove><![CDATA[
+
+Contenuti spostati in archivio online:
+ ]]></textSeparatorMove>   
+
+</mail> </contentThreadconfig>'));
+
+-- ************* To 6.3.2 *************
+
+CREATE TABLE userpreferences
+( username character varying(80) NOT NULL,
+  wizard smallint NOT NULL,
+  loadonpageselect smallint NOT NULL,
+  translationwarning smallint NOT NULL,
+  CONSTRAINT userpreferences_pkey PRIMARY KEY (username)
+);
+
+ALTER TABLE userpreferences ADD (defaultpageownergroup character varying(64));
+ALTER TABLE userpreferences ADD (defaultpagejoingroups character varying(256));
+ALTER TABLE userpreferences ADD (defaultcontentownergroup character varying(64));
+ALTER TABLE userpreferences ADD (defaultcontentjoingroups character varying(256));
+ALTER TABLE userpreferences ADD (defaultwidgetownergroup character varying(64));
+ALTER TABLE userpreferences ADD (defaultwidgetjoingroups character varying(256));
+
+ALTER TABLE resources ADD (correlationcode character varying(256));
+
+ALTER TABLE widgetcatalog ADD (readonlypagewidgetconfig NUMBER(1) DEFAULT 0);
+ALTER TABLE widgetcatalog ADD (widgetcategory character varying(80));
+ALTER TABLE widgetcatalog ADD (icon character varying(80));
diff --git a/webapp/upgrade/4.3.2-to-6.3.2/oracle/serv.sql b/webapp/upgrade/4.3.2-to-6.3.2/oracle/serv.sql
new file mode 100644
index 0000000000..5026e399a6
--- /dev/null
+++ b/webapp/upgrade/4.3.2-to-6.3.2/oracle/serv.sql
@@ -0,0 +1,18 @@
+-- Script for upgrading Oracle serv database from Entando 4.3.2 to 6.3.2
+-- Not a final target: continue with 6.3.2-to-7.0.0/oracle/serv.sql to reach 7.0.0.
+
+-- ************* To 5.0.0 *************
+-- Nothing to do
+
+-- ************* To 5.3.2 *************
+-- Nothing to do
+
+-- ************* To 6.2.0 *************
+
+ALTER TABLE authusers MODIFY username VARCHAR2(80);
+ALTER TABLE authusergrouprole MODIFY username VARCHAR2(80);
+ALTER TABLE authuserprofileattrroles MODIFY username VARCHAR2(80);
+ALTER TABLE authusershortcuts MODIFY username VARCHAR2(80);
+
+-- ************* To 6.3.2 *************
+-- Nothing to do
\ No newline at end of file
diff --git a/webapp/upgrade/4.3.2-to-7.0/postgresql/port.sql b/webapp/upgrade/4.3.2-to-6.3.2/postgresql/port.sql
similarity index 58%
rename from webapp/upgrade/4.3.2-to-7.0/postgresql/port.sql
rename to webapp/upgrade/4.3.2-to-6.3.2/postgresql/port.sql
index 6b9c3dda69..be9257ccbf 100644
--- a/webapp/upgrade/4.3.2-to-7.0/postgresql/port.sql
+++ b/webapp/upgrade/4.3.2-to-6.3.2/postgresql/port.sql
@@ -1,4 +1,5 @@
--- from <entando.version>4.3.2</entando.version>
+-- Script for upgrading PostgreSQL port database from Entando 4.3.2 to 6.3.2
+-- Not a final target: continue with 6.3.2-to-7.0.0/postgresql/port.sql to reach 7.0.0.
 
 -- ************* To 5.0.0 *************
 
@@ -193,72 +194,3 @@ ALTER TABLE resources ADD COLUMN correlationcode character varying(256);
 ALTER TABLE widgetcatalog ADD COLUMN readonlypagewidgetconfig smallint;
 ALTER TABLE widgetcatalog ADD COLUMN widgetcategory character varying(80);
 ALTER TABLE widgetcatalog ADD COLUMN icon character varying(80);
-
--- ************* To 7.0.0 *************
-DELETE FROM sysconfig WHERE item = 'dataobjectsubdir';
-DELETE FROM sysconfig WHERE item = 'dataTypeDefinitions';
-ALTER TABLE guifragment ALTER COLUMN locked DROP NOT NULL;
-ALTER TABLE widgetcatalog ALTER COLUMN locked DROP NOT NULL;
-ALTER TABLE pages ALTER COLUMN pos DROP NOT NULL;
-ALTER TABLE localstrings ALTER COLUMN stringvalue DROP NOT NULL;
-
-ALTER TABLE widgetconfig ALTER COLUMN framepos TYPE smallint;
-ALTER TABLE widgetconfig_draft ALTER COLUMN framepos TYPE smallint;
-
-CREATE TABLE databasechangelog (
-  id varchar(255) NOT NULL,
-  author varchar(255) NOT NULL,
-  filename varchar(255) NOT NULL,
-  dateexecuted timestamp NOT NULL,
-  orderexecuted int4 NOT NULL,
-  exectype varchar(10) NOT NULL,
-  md5sum varchar(35) NULL,
-  description varchar(255) NULL,
-  comments varchar(255) NULL,
-  tag varchar(255) NULL,
-  liquibase varchar(20) NULL,
-  contexts varchar(255) NULL,
-  labels varchar(255) NULL,
-  deployment_id varchar(10) NULL
-);
-CREATE TABLE databasechangeloglock (
-  id int4 NOT NULL,
-  locked bool NOT NULL,
-  lockgranted timestamp NULL,
-  lockedby varchar(255) NULL,
-  CONSTRAINT databasechangeloglock_pkey PRIMARY KEY (id)
-);
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_schemaPort','entando','liquibase/port/00000000000001_schemaPort.xml','2022-03-03 12:12:32.446304',1,'EXECUTED','8:ca0f8957e59d0a535f286d630767e814','createTable tableName=sysconfig; createTable tableName=categories; createTable tableName=localstrings; createTable tableName=pagemodels; createTable tableName=pages; createTable tableName=pages_metadata_online; addForeignKeyConstraint baseTableNam...','',NULL,'4.4.3',NULL,NULL,'6305951931'),
-  ('00000000000001_dataPort_production','entando','liquibase/port/00000000000001_dataPort_production.xml','2022-03-03 12:12:32.72679',2,'EXECUTED','8:f1d2f81737cddd29dfa883fdc990faa0','insert tableName=categories; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; i...','',NULL,'4.4.3','production',NULL,'6305951931'),
-  ('00000000000001_de_defaultResources_dataPort_production','entando','liquibase/defaultResources/port/00000000000001_dataPort_production.xml','2022-03-03 12:12:35.532485',6,'EXECUTED','8:7de85f47914acfe5b22c8c7db3228f09','insert tableName=widgetcatalog; insert tableName=guifragment; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings;...','',NULL,'4.4.3','production',NULL,'6305955238');         
-
-ALTER TABLE contentattributeroles ALTER COLUMN attrname DROP NOT NULL;
-ALTER TABLE contentattributeroles ALTER COLUMN rolename DROP NOT NULL;
-ALTER TABLE contentsearch ALTER COLUMN attrname DROP NOT NULL;
-ALTER TABLE workcontentattributeroles ALTER COLUMN attrname DROP NOT NULL;
-ALTER TABLE workcontentattributeroles ALTER COLUMN rolename DROP NOT NULL;
-ALTER TABLE workcontentsearch ALTER COLUMN attrname DROP NOT NULL;
-ALTER TABLE resourcerelations ALTER COLUMN refcategory DROP NOT NULL;
-
-ALTER TABLE workcontentattributeroles ALTER COLUMN rolename TYPE varchar(30);
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_jacms_schemaPort','entando','liquibase/jacms/port/00000000000001_schemaPort.xml','2022-03-03 12:12:34.162904',3,'EXECUTED','8:4b138e1a635c359489a8b4dbeae439cb','createTable tableName=contentmodels; createTable tableName=contents; createIndex indexName=contents_contenttype_idx, tableName=contents; createIndex indexName=contents_lastmodified_idx, tableName=contents; createIndex indexName=contents_maingroup_...','',NULL,'4.4.3',NULL,NULL,'6305953882'),
-  ('00000000000001_jacms_dataPort_production','entando','liquibase/jacms/port/00000000000001_dataPort_production.xml','2022-03-03 12:12:34.262709',4,'EXECUTED','8:563907e57e3ac8a1e6e8f1dc4a7467d0','insert tableName=sysconfig; insert tableName=sysconfig; insert tableName=sysconfig; insert tableName=sysconfig; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tabl...','',NULL,'4.4.3','production',NULL,'6305953882');
-
-ALTER TABLE jpversioning_versionedcontents ALTER COLUMN descr TYPE varchar(256);
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_jpversioning_schemaPort','entando','liquibase/jpversioning/port/00000000000001_schemaPort.xml','2022-03-03 12:12:35.877767',7,'EXECUTED','8:fa3f7bbe1e84964a52b5d49609df135b','createTable tableName=jpversioning_trashedresources; createTable tableName=jpversioning_versionedcontents; addUniqueConstraint constraintName=jpvers_contentvers_key, tableName=jpversioning_versionedcontents','',NULL,'4.4.3',NULL,NULL,'6305955828');
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_jpmail_dataPort_production','entando','liquibase/jpmail/port/00000000000001_dataPort_production.xml','2022-03-03 12:12:34.621258',5,'EXECUTED','8:a7e88f5e191c357dd3e503963b0730ba','insert tableName=sysconfig','',NULL,'4.4.3','production',NULL,'6305954611');
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_jpseo_schemaPort','entando','liquibase/jpseo/port/00000000000001_schemaPort.xml','2022-03-03 12:12:36.252658',8,'EXECUTED','8:0cac575831787759faf345608323ed1f','createTable tableName=jpseo_friendlycode','',NULL,'4.4.3',NULL,NULL,'6305956213'),
-  ('00000000000001_jpseo_dataPort_production','entando','liquibase/jpseo/port/00000000000001_dataPort_production.xml','2022-03-03 12:12:36.280257',9,'EXECUTED','8:283a24fe0ff8c95c4806a1fc9ecc5fa9','insert tableName=widgetcatalog; insert tableName=guifragment; insert tableName=guifragment','',NULL,'4.4.3','production',NULL,'6305956213');
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id)
-  VALUES('00000000000001_jpcontentscheduler_dataPort_production', 'entando', 'liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml', '2022-03-03 15:44:33.948', 8, 'EXECUTED', '8:ea617c252a9fd7ef7158ce075325969b', 'insert tableName=sysconfig', '', NULL, '4.4.3', 'production', NULL, '6318673902');
diff --git a/webapp/upgrade/4.3.2-to-6.3.2/postgresql/serv.sql b/webapp/upgrade/4.3.2-to-6.3.2/postgresql/serv.sql
new file mode 100644
index 0000000000..229d3b13e0
--- /dev/null
+++ b/webapp/upgrade/4.3.2-to-6.3.2/postgresql/serv.sql
@@ -0,0 +1,30 @@
+-- Script for upgrading PostgreSQL serv database from Entando 4.3.2 to 6.3.2
+-- Not a final target: continue with 6.3.2-to-7.0.0/postgresql/serv.sql to reach 7.0.0.
+
+-- ************* To 5.0.0 *************
+-- Nothing to do
+
+-- ************* To 5.3.2 *************
+-- Nothing to do
+
+-- ************* To 6.2.0 *************
+
+ALTER TABLE authusers ALTER COLUMN username TYPE character varying(80);
+ALTER TABLE authusergrouprole ALTER COLUMN username TYPE character varying(80);
+ALTER TABLE authuserprofileattrroles ALTER COLUMN username TYPE character varying(80);
+ALTER TABLE authusershortcuts ALTER COLUMN username TYPE character varying(80);
+
+ALTER TABLE actionlogrecords ALTER COLUMN actionname TYPE character varying(250);
+
+ALTER TABLE api_oauth_tokens ALTER COLUMN localuser TYPE character varying(255);
+
+ALTER TABLE actionloglikerecords ALTER COLUMN id SET DEFAULT nextval('actionloglikerecords_id_seq'::regclass);
+ALTER TABLE actionlogrelations ALTER COLUMN id SET DEFAULT nextval('actionlogrelations_id_seq'::regclass);
+
+ALTER TABLE authrolepermissions ALTER COLUMN id SET DEFAULT nextval('authrolepermissions_id_seq'::regclass);
+ALTER TABLE authusergrouprole ALTER COLUMN id SET DEFAULT nextval('authusergrouprole_id_seq'::regclass);
+ALTER TABLE authuserprofileattrroles ALTER COLUMN id SET DEFAULT nextval('authuserprofileattrroles_id_seq'::regclass);
+ALTER TABLE authuserprofilesearch ALTER COLUMN id SET DEFAULT nextval('authuserprofilesearch_id_seq'::regclass);
+
+-- ************* To 6.3.2 *************
+-- Nothing to do
diff --git a/webapp/upgrade/4.3.2-to-7.0/postgresql/serv.sql b/webapp/upgrade/4.3.2-to-7.0/postgresql/serv.sql
deleted file mode 100644
index 9a1977dd7c..0000000000
--- a/webapp/upgrade/4.3.2-to-7.0/postgresql/serv.sql
+++ /dev/null
@@ -1,87 +0,0 @@
--- from <entando.version>4.3.2</entando.version>
-
--- ************* To 5.0.0 *************
--- Nothing to do
-
--- ************* To 5.3.2 *************
--- Nothing to do
-
--- ************* To 6.2.0 *************
-ALTER TABLE authusers ALTER COLUMN username TYPE character varying(80);
-ALTER TABLE authusergrouprole ALTER COLUMN username TYPE character varying(80);
-ALTER TABLE authuserprofileattrroles ALTER COLUMN username TYPE character varying(80);
-ALTER TABLE authusershortcuts ALTER COLUMN username TYPE character varying(80);
-
-ALTER TABLE actionlogrecords ALTER COLUMN actionname TYPE character varying(250);
-
-ALTER TABLE api_oauth_tokens ALTER COLUMN localuser TYPE character varying(255);
-
-ALTER TABLE actionloglikerecords ALTER COLUMN id SET DEFAULT nextval('actionloglikerecords_id_seq'::regclass);
-ALTER TABLE actionlogrelations ALTER COLUMN id SET DEFAULT nextval('actionlogrelations_id_seq'::regclass);
-
-ALTER TABLE authrolepermissions ALTER COLUMN id SET DEFAULT nextval('authrolepermissions_id_seq'::regclass);
-ALTER TABLE authusergrouprole ALTER COLUMN id SET DEFAULT nextval('authusergrouprole_id_seq'::regclass);
-ALTER TABLE authuserprofileattrroles ALTER COLUMN id SET DEFAULT nextval('authuserprofileattrroles_id_seq'::regclass);
-ALTER TABLE authuserprofilesearch ALTER COLUMN id SET DEFAULT nextval('authuserprofilesearch_id_seq'::regclass);
-
--- ************* To 6.3.2 *************
--- Nothing to do
-
--- ************* To 7.0.0 *************
-
-DROP TABLE dataobjectsearch;
-DROP TABLE dataobjectattributeroles;
-DROP TABLE dataobjectmodels;
-DROP TABLE dataobjectrelations;
-DROP TABLE dataobjects;
-
-DROP SEQUENCE IF EXISTS dataobjectattributeroles_id_seq;
-DROP SEQUENCE IF EXISTS dataobjectrelations_id_seq;
-DROP SEQUENCE IF EXISTS dataobjectsearch_id_seq;
-
-ALTER TABLE authuserprofileattrroles ALTER COLUMN attrname DROP NOT NULL;
-ALTER TABLE authuserprofileattrroles ALTER COLUMN rolename DROP NOT NULL;
-ALTER TABLE authuserprofilesearch ALTER COLUMN attrname DROP NOT NULL;
-
-ALTER TABLE actionlogrecords ALTER COLUMN actionname TYPE varchar(40);
-ALTER TABLE api_oauth_tokens ALTER COLUMN localuser TYPE varchar(255);
-
--- pay attention - sequence must have same owner as table it is linked to
-CREATE SEQUENCE actionlogcommentrecords_id_seq OWNED BY actionlogcommentrecords.id;
-ALTER TABLE actionlogcommentrecords ALTER COLUMN id SET DEFAULT nextval('actionlogcommentrecords_id_seq');
-
-CREATE TABLE databasechangelog (
-  id varchar(255) NOT NULL,
-  author varchar(255) NOT NULL,
-  filename varchar(255) NOT NULL,
-  dateexecuted timestamp NOT NULL,
-  orderexecuted int4 NOT NULL,
-  exectype varchar(10) NOT NULL,
-  md5sum varchar(35) NULL,
-  description varchar(255) NULL,
-  comments varchar(255) NULL,
-  tag varchar(255) NULL,
-  liquibase varchar(20) NULL,
-  contexts varchar(255) NULL,
-  labels varchar(255) NULL,
-  deployment_id varchar(10) NULL
-);
-CREATE TABLE databasechangeloglock (
-  id int4 NOT NULL,
-  locked bool NOT NULL,
-  lockgranted timestamp NULL,
-  lockedby varchar(255) NULL,
-  CONSTRAINT databasechangeloglock_pkey PRIMARY KEY (id)
-);
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_schemaServ','entando','liquibase/serv/00000000000001_schemaServ.xml','2022-03-03 12:12:33.41696',1,'EXECUTED','8:34d064f27c2a4d67d3797a8c2fb5ef58','createTable tableName=authgroups; createTable tableName=authpermissions; createTable tableName=authroles; createTable tableName=authrolepermissions; addForeignKeyConstraint baseTableName=authrolepermissions, constraintName=authrolepermissions_role...','',NULL,'4.4.3',NULL,NULL,'6305953101'),
-  ('00000000000001_schemaServ_consumers','entando','liquibase/serv/00000000000001_schemaServ.xml','2022-03-03 12:12:33.445449',2,'EXECUTED','8:9de859f33cc0ee804dcc703b09b03681','createTable tableName=api_oauth_consumers','',NULL,'4.4.3',NULL,NULL,'6305953101'),
-  ('00000000000001_dataServ_production','entando','liquibase/serv/00000000000001_dataServ_production.xml','2022-03-03 12:12:33.492386',3,'EXECUTED','8:e9f08ba4d2b4976f2a016fab54deb591','insert tableName=authgroups; insert tableName=authgroups; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=au...','',NULL,'4.4.3','production',NULL,'6305953101');
-
-INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
-  ('00000000000001_adminconsole_schemaServ','entando','liquibase/admin-console/serv/00000000000001_schemaServ.xml','2022-03-03 12:12:34.978668',4,'EXECUTED','8:950e18117492e0486cba83d27a5856f8','createTable tableName=authusershortcuts','',NULL,'4.4.3',NULL,NULL,'6305954961'),
-  ('00000000000001_adminconsole_dataServ_production','entando','liquibase/admin-console/serv/00000000000001_dataServ_production.xml','2022-03-03 12:12:34.990755',5,'EXECUTED','8:2b5e09374fa37f80c4d2c8de7e58a2f6','insert tableName=authusershortcuts','',NULL,'4.4.3','production',NULL,'6305954961');
-
--- ATTENTION reset local admin password
-UPDATE public.authusers SET passwd = '{bcrypt}$2a$10$TMRaAmZE4w5LEeELdmpJguuSuJc2D9hUelMGmsJyK35K3PBiePqXu' WHERE username = 'admin';
\ No newline at end of file
diff --git a/webapp/upgrade/6.3.2-to-7.0.0/mysql/port.sql b/webapp/upgrade/6.3.2-to-7.0.0/mysql/port.sql
index b4d09d4646..4a729a5ef0 100644
--- a/webapp/upgrade/6.3.2-to-7.0.0/mysql/port.sql
+++ b/webapp/upgrade/6.3.2-to-7.0.0/mysql/port.sql
@@ -100,3 +100,38 @@ INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted
 
 INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id)
   VALUES('00000000000001_jpcontentscheduler_dataPort_production', 'entando', 'liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml', '2022-03-03 15:44:33.948', 8, 'EXECUTED', '8:ea617c252a9fd7ef7158ce075325969b', 'insert tableName=sysconfig', '', NULL, '4.4.3', 'production', NULL, '6318673902');
+
+-- content templates (7.x compatibility)
+-- Add a CSP nonce to inline <script> tags and migrate Velocity $velocityCount to $foreach.count
+
+-- UPDATE pagemodels
+-- SET templategui = REPLACE(templategui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE templategui LIKE '%<script%' AND templategui NOT LIKE '%nonce=%';
+--
+-- UPDATE guifragment
+-- SET gui = REPLACE(gui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE gui LIKE '%<script%' AND gui NOT LIKE '%nonce=%';
+--
+-- UPDATE guifragment
+-- SET defaultgui = REPLACE(defaultgui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE defaultgui LIKE '%<script%' AND defaultgui NOT LIKE '%nonce=%';
+--
+-- UPDATE pagemodels
+-- SET templategui = CONCAT('<#assign wp=JspTaglibs["/aps-core"]>', CHAR(10 USING utf8mb4), templategui)
+-- WHERE templategui LIKE '%cspNonce%' AND templategui NOT LIKE '%/aps-core%';
+--
+-- UPDATE guifragment
+-- SET gui = CONCAT('<#assign wp=JspTaglibs["/aps-core"]>', CHAR(10 USING utf8mb4), gui)
+-- WHERE gui LIKE '%cspNonce%' AND gui NOT LIKE '%/aps-core%';
+--
+-- UPDATE guifragment
+-- SET defaultgui = CONCAT('<#assign wp=JspTaglibs["/aps-core"]>', CHAR(10 USING utf8mb4), defaultgui)
+-- WHERE defaultgui LIKE '%cspNonce%' AND defaultgui NOT LIKE '%/aps-core%';
+--
+-- UPDATE contentmodels
+-- SET model = REPLACE(model, '<script', '<script nonce="$content.nonce"')
+-- WHERE model LIKE '%<script%' AND model NOT LIKE '%nonce=%';
+--
+-- UPDATE contentmodels
+-- SET model = REPLACE(model, '$velocityCount', '$foreach.count')
+-- WHERE model LIKE '%$velocityCount%';
diff --git a/webapp/upgrade/6.3.2-to-7.0.0/oracle/port.sql b/webapp/upgrade/6.3.2-to-7.0.0/oracle/port.sql
new file mode 100644
index 0000000000..5320dbbdcb
--- /dev/null
+++ b/webapp/upgrade/6.3.2-to-7.0.0/oracle/port.sql
@@ -0,0 +1,117 @@
+-- Script for upgrading Oracle port database from Entando 6.3.2 to 7.0.0
+
+-- core
+
+DELETE FROM sysconfig WHERE item = 'dataTypeDefinitions';
+DELETE FROM sysconfig WHERE item = 'dataobjectsubdir';
+
+ALTER TABLE guifragment MODIFY locked NULL;
+ALTER TABLE widgetcatalog MODIFY locked NULL;
+ALTER TABLE pages MODIFY pos NULL;
+ALTER TABLE localstrings MODIFY stringvalue NULL;
+
+CREATE TABLE DATABASECHANGELOG (
+                                   ID VARCHAR2(255) NOT NULL,
+                                   AUTHOR VARCHAR2(255) NOT NULL,
+                                   FILENAME VARCHAR2(255) NOT NULL,
+                                   DATEEXECUTED TIMESTAMP NOT NULL,
+                                   ORDEREXECUTED NUMBER(10) NOT NULL,
+                                   EXECTYPE VARCHAR2(10) NOT NULL,
+                                   MD5SUM VARCHAR2(35) DEFAULT NULL,
+                                   DESCRIPTION VARCHAR2(255) DEFAULT NULL,
+                                   COMMENTS VARCHAR2(255) DEFAULT NULL,
+                                   TAG VARCHAR2(255) DEFAULT NULL,
+                                   LIQUIBASE VARCHAR2(20) DEFAULT NULL,
+                                   CONTEXTS VARCHAR2(255) DEFAULT NULL,
+                                   LABELS VARCHAR2(255) DEFAULT NULL,
+                                   DEPLOYMENT_ID VARCHAR2(10) DEFAULT NULL
+);
+
+CREATE TABLE DATABASECHANGELOGLOCK (
+                                       ID NUMBER(10) NOT NULL,
+                                       LOCKED NUMBER(1) NOT NULL,
+                                       LOCKGRANTED TIMESTAMP DEFAULT NULL,
+                                       LOCKEDBY VARCHAR2(255) DEFAULT NULL,
+                                       PRIMARY KEY (ID)
+);
+
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_schemaPort','entando','liquibase/port/00000000000001_schemaPort.xml',TO_TIMESTAMP('2022-03-03 12:12:32.446304', 'YYYY-MM-DD HH24:MI:SS.FF6'),1,'EXECUTED','8:ca0f8957e59d0a535f286d630767e814','createTable tableName=sysconfig; createTable tableName=categories; createTable tableName=localstrings; createTable tableName=pagemodels; createTable tableName=pages; createTable tableName=pages_metadata_online; addForeignKeyConstraint baseTableNam...','',NULL,'4.4.3',NULL,NULL,'6305951931');
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_dataPort_production','entando','liquibase/port/00000000000001_dataPort_production.xml',TO_TIMESTAMP('2022-03-03 12:12:32.72679', 'YYYY-MM-DD HH24:MI:SS.FF5'),2,'EXECUTED','8:f1d2f81737cddd29dfa883fdc990faa0','insert tableName=categories; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; i...','',NULL,'4.4.3','production',NULL,'6305951931');
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_de_defaultResources_dataPort_production','entando','liquibase/defaultResources/port/00000000000001_dataPort_production.xml',TO_TIMESTAMP('2022-03-03 12:12:35.532485', 'YYYY-MM-DD HH24:MI:SS.FF6'),6,'EXECUTED','8:7de85f47914acfe5b22c8c7db3228f09','insert tableName=widgetcatalog; insert tableName=guifragment; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings;...','',NULL,'4.4.3','production',NULL,'6305955238');
+
+-- jacms
+
+ALTER TABLE contentattributeroles MODIFY (attrname character varying(30));
+ALTER TABLE contentattributeroles MODIFY (rolename character varying(50));
+ALTER TABLE contentsearch MODIFY (attrname character varying(30));
+ALTER TABLE workcontentattributeroles MODIFY (attrname character varying(30));
+ALTER TABLE workcontentattributeroles MODIFY (rolename character varying(30));
+ALTER TABLE workcontentsearch MODIFY (attrname character varying(30));
+ALTER TABLE resourcerelations MODIFY (refcategory character varying(30));
+
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_jacms_schemaPort','entando','liquibase/jacms/port/00000000000001_schemaPort.xml',TO_TIMESTAMP('2022-03-03 12:12:34.162904', 'YYYY-MM-DD HH24:MI:SS.FF6'),3,'EXECUTED','8:4b138e1a635c359489a8b4dbeae439cb','createTable tableName=contentmodels; createTable tableName=contents; createIndex indexName=contents_contenttype_idx, tableName=contents; createIndex indexName=contents_lastmodified_idx, tableName=contents; createIndex indexName=contents_maingroup_...','',NULL,'4.4.3',NULL,NULL,'6305953882');
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_jacms_dataPort_production','entando','liquibase/jacms/port/00000000000001_dataPort_production.xml',TO_TIMESTAMP('2022-03-03 12:12:34.262709', 'YYYY-MM-DD HH24:MI:SS.FF6'),4,'EXECUTED','8:563907e57e3ac8a1e6e8f1dc4a7467d0','insert tableName=sysconfig; insert tableName=sysconfig; insert tableName=sysconfig; insert tableName=sysconfig; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tableName=localstrings; insert tabl...','',NULL,'4.4.3','production',NULL,'6305953882');
+
+-- jpversioning
+
+ALTER TABLE jpversioning_versionedcontents MODIFY (descr character varying(256));
+
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_jpversioning_schemaPort','entando','liquibase/jpversioning/port/00000000000001_schemaPort.xml',TO_TIMESTAMP('2022-03-03 12:12:35.877767', 'YYYY-MM-DD HH24:MI:SS.FF6'),7,'EXECUTED','8:fa3f7bbe1e84964a52b5d49609df135b','createTable tableName=jpversioning_trashedresources; createTable tableName=jpversioning_versionedcontents; addUniqueConstraint constraintName=jpvers_contentvers_key, tableName=jpversioning_versionedcontents','',NULL,'4.4.3',NULL,NULL,'6305955828');
+
+-- jpmail
+
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_jpmail_dataPort_production','entando','liquibase/jpmail/port/00000000000001_dataPort_production.xml',TO_TIMESTAMP('2022-03-03 12:12:34.621258', 'YYYY-MM-DD HH24:MI:SS.FF6'),5,'EXECUTED','8:a7e88f5e191c357dd3e503963b0730ba','insert tableName=sysconfig','',NULL,'4.4.3','production',NULL,'6305954611');
+
+-- jpseo
+
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_jpseo_schemaPort','entando','liquibase/jpseo/port/00000000000001_schemaPort.xml',TO_TIMESTAMP('2022-03-03 12:12:36.252658', 'YYYY-MM-DD HH24:MI:SS.FF6'),8,'EXECUTED','8:0cac575831787759faf345608323ed1f','createTable tableName=jpseo_friendlycode','',NULL,'4.4.3',NULL,NULL,'6305956213');
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+    ('00000000000001_jpseo_dataPort_production','entando','liquibase/jpseo/port/00000000000001_dataPort_production.xml',TO_TIMESTAMP('2022-03-03 12:12:36.280257', 'YYYY-MM-DD HH24:MI:SS.FF6'),9,'EXECUTED','8:283a24fe0ff8c95c4806a1fc9ecc5fa9','insert tableName=widgetcatalog; insert tableName=guifragment; insert tableName=guifragment','',NULL,'4.4.3','production',NULL,'6305956213');
+
+-- jpcontentscheduler
+
+INSERT INTO DATABASECHANGELOG (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id)
+VALUES('00000000000001_jpcontentscheduler_dataPort_production', 'entando', 'liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml', TO_TIMESTAMP('2022-03-03 15:44:33.948', 'YYYY-MM-DD HH24:MI:SS.FF3'), 8, 'EXECUTED', '8:ea617c252a9fd7ef7158ce075325969b', 'insert tableName=sysconfig', '', NULL, '4.4.3', 'production', NULL, '6318673902');
+
+-- content templates (7.x compatibility)
+-- Add a CSP nonce to inline <script> tags and migrate Velocity $velocityCount to $foreach.count
+
+-- UPDATE pagemodels
+-- SET templategui = REPLACE(templategui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE templategui LIKE '%<script%' AND templategui NOT LIKE '%nonce=%';
+--
+-- UPDATE guifragment
+-- SET gui = REPLACE(gui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE gui LIKE '%<script%' AND gui NOT LIKE '%nonce=%';
+--
+-- UPDATE guifragment
+-- SET defaultgui = REPLACE(defaultgui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE defaultgui LIKE '%<script%' AND defaultgui NOT LIKE '%nonce=%';
+--
+-- UPDATE pagemodels
+-- SET templategui = '<#assign wp=JspTaglibs["/aps-core"]>' || CHR(10) || templategui
+-- WHERE templategui LIKE '%cspNonce%' AND templategui NOT LIKE '%/aps-core%';
+--
+-- UPDATE guifragment
+-- SET gui = '<#assign wp=JspTaglibs["/aps-core"]>' || CHR(10) || gui
+-- WHERE gui LIKE '%cspNonce%' AND gui NOT LIKE '%/aps-core%';
+--
+-- UPDATE guifragment
+-- SET defaultgui = '<#assign wp=JspTaglibs["/aps-core"]>' || CHR(10) || defaultgui
+-- WHERE defaultgui LIKE '%cspNonce%' AND defaultgui NOT LIKE '%/aps-core%';
+--
+-- UPDATE contentmodels
+-- SET model = REPLACE(model, '<script', '<script nonce="$content.nonce"')
+-- WHERE model LIKE '%<script%' AND model NOT LIKE '%nonce=%';
+--
+-- UPDATE contentmodels
+-- SET model = REPLACE(model, '$velocityCount', '$foreach.count')
+-- WHERE model LIKE '%$velocityCount%';
\ No newline at end of file
diff --git a/webapp/upgrade/6.3.2-to-7.0.0/oracle/serv.sql b/webapp/upgrade/6.3.2-to-7.0.0/oracle/serv.sql
new file mode 100644
index 0000000000..56aea1e8e3
--- /dev/null
+++ b/webapp/upgrade/6.3.2-to-7.0.0/oracle/serv.sql
@@ -0,0 +1,56 @@
+-- Script for upgrading Oracle serv database from Entando 6.3.2 to 7.0.0
+
+-- core
+
+DROP TABLE dataobjectattributeroles CASCADE CONSTRAINTS;
+DROP TABLE dataobjectmodels CASCADE CONSTRAINTS;
+DROP TABLE dataobjectrelations CASCADE CONSTRAINTS;
+DROP TABLE dataobjects CASCADE CONSTRAINTS;
+DROP TABLE dataobjectsearch CASCADE CONSTRAINTS;
+
+ALTER TABLE authuserprofileattrroles MODIFY attrname NULL;
+ALTER TABLE authuserprofileattrroles MODIFY rolename NULL;
+ALTER TABLE authuserprofilesearch MODIFY attrname NULL;
+
+ALTER TABLE actionlogrecords MODIFY actionname VARCHAR2(40);
+ALTER TABLE api_oauth_tokens MODIFY localuser VARCHAR2(255);
+
+CREATE SEQUENCE actionlogcommentrecords_id_seq;
+
+CREATE TABLE databasechangelog (
+  id varchar(255) NOT NULL,
+  author varchar(255) NOT NULL,
+  filename varchar(255) NOT NULL,
+  dateexecuted timestamp NOT NULL,
+  orderexecuted NUMBER(38) NOT NULL,
+  exectype varchar(10) NOT NULL,
+  md5sum varchar(35) NULL,
+  description varchar(255) NULL,
+  comments varchar(255) NULL,
+  tag varchar(255) NULL,
+  liquibase varchar(20) NULL,
+  contexts varchar(255) NULL,
+  labels varchar(255) NULL,
+  deployment_id varchar(10) NULL
+);
+CREATE TABLE databasechangeloglock (
+  id NUMBER(38) NOT NULL,
+  locked NUMBER(1) NOT NULL,
+  lockgranted timestamp NULL,
+  lockedby varchar(255) NULL,
+  CONSTRAINT databasechangeloglock_pkey PRIMARY KEY (id)
+);
+
+INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+  ('00000000000001_schemaServ','entando','liquibase/serv/00000000000001_schemaServ.xml',TO_TIMESTAMP('2022-03-03 12:12:33.41696', 'YYYY-MM-DD HH24:MI:SS.FF6'),1,'EXECUTED','8:34d064f27c2a4d67d3797a8c2fb5ef58','createTable tableName=authgroups; createTable tableName=authpermissions; createTable tableName=authroles; createTable tableName=authrolepermissions; addForeignKeyConstraint baseTableName=authrolepermissions, constraintName=authrolepermissions_role...','',NULL,'4.4.3',NULL,NULL,'6305953101');
+INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+  ('00000000000001_schemaServ_consumers','entando','liquibase/serv/00000000000001_schemaServ.xml',TO_TIMESTAMP('2022-03-03 12:12:33.445449', 'YYYY-MM-DD HH24:MI:SS.FF6'),2,'EXECUTED','8:9de859f33cc0ee804dcc703b09b03681','createTable tableName=api_oauth_consumers','',NULL,'4.4.3',NULL,NULL,'6305953101');
+INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+  ('00000000000001_dataServ_production','entando','liquibase/serv/00000000000001_dataServ_production.xml',TO_TIMESTAMP('2022-03-03 12:12:33.492386', 'YYYY-MM-DD HH24:MI:SS.FF6'),3,'EXECUTED','8:e9f08ba4d2b4976f2a016fab54deb591','insert tableName=authgroups; insert tableName=authgroups; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=authpermissions; insert tableName=au...','',NULL,'4.4.3','production',NULL,'6305953101');
+
+-- admin console
+
+INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+  ('00000000000001_adminconsole_schemaServ','entando','liquibase/admin-console/serv/00000000000001_schemaServ.xml',TO_TIMESTAMP('2022-03-03 12:12:34.978668', 'YYYY-MM-DD HH24:MI:SS.FF6'),4,'EXECUTED','8:950e18117492e0486cba83d27a5856f8','createTable tableName=authusershortcuts','',NULL,'4.4.3',NULL,NULL,'6305954961');
+INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) VALUES
+  ('00000000000001_adminconsole_dataServ_production','entando','liquibase/admin-console/serv/00000000000001_dataServ_production.xml',TO_TIMESTAMP('2022-03-03 12:12:34.990755', 'YYYY-MM-DD HH24:MI:SS.FF6'),5,'EXECUTED','8:2b5e09374fa37f80c4d2c8de7e58a2f6','insert tableName=authusershortcuts','',NULL,'4.4.3','production',NULL,'6305954961');
\ No newline at end of file
diff --git a/webapp/upgrade/6.3.2-to-7.0.0/postgresql/port.sql b/webapp/upgrade/6.3.2-to-7.0.0/postgresql/port.sql
index 804f49f7b6..ee0997795c 100644
--- a/webapp/upgrade/6.3.2-to-7.0.0/postgresql/port.sql
+++ b/webapp/upgrade/6.3.2-to-7.0.0/postgresql/port.sql
@@ -77,3 +77,38 @@ INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted
 
 INSERT INTO databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id)
   VALUES('00000000000001_jpcontentscheduler_dataPort_production', 'entando', 'liquibase/jpcontentscheduler/port/00000000000001_dataPort_production.xml', '2022-03-03 15:44:33.948', 8, 'EXECUTED', '8:ea617c252a9fd7ef7158ce075325969b', 'insert tableName=sysconfig', '', NULL, '4.4.3', 'production', NULL, '6318673902');
+
+-- content templates (7.x compatibility)
+-- Add a CSP nonce to inline <script> tags and migrate Velocity $velocityCount to $foreach.count
+
+-- UPDATE pagemodels
+-- SET templategui = REPLACE(templategui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE templategui LIKE '%<script%' AND templategui NOT LIKE '%nonce=%';
+--
+-- UPDATE guifragment
+-- SET gui = REPLACE(gui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE gui LIKE '%<script%' AND gui NOT LIKE '%nonce=%';
+--
+-- UPDATE guifragment
+-- SET defaultgui = REPLACE(defaultgui, '<script', '<script nonce="<@wp.cspNonce />"')
+-- WHERE defaultgui LIKE '%<script%' AND defaultgui NOT LIKE '%nonce=%';
+--
+-- UPDATE pagemodels
+-- SET templategui = '<#assign wp=JspTaglibs["/aps-core"]>' || CHR(10) || templategui
+-- WHERE templategui LIKE '%cspNonce%' AND templategui NOT LIKE '%/aps-core%';
+--
+-- UPDATE guifragment
+-- SET gui = '<#assign wp=JspTaglibs["/aps-core"]>' || CHR(10) || gui
+-- WHERE gui LIKE '%cspNonce%' AND gui NOT LIKE '%/aps-core%';
+--
+-- UPDATE guifragment
+-- SET defaultgui = '<#assign wp=JspTaglibs["/aps-core"]>' || CHR(10) || defaultgui
+-- WHERE defaultgui LIKE '%cspNonce%' AND defaultgui NOT LIKE '%/aps-core%';
+--
+-- UPDATE contentmodels
+-- SET model = REPLACE(model, '<script', '<script nonce="$content.nonce"')
+-- WHERE model LIKE '%<script%' AND model NOT LIKE '%nonce=%';
+--
+-- UPDATE contentmodels
+-- SET model = REPLACE(model, '$velocityCount', '$foreach.count')
+-- WHERE model LIKE '%$velocityCount%';