diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e69de29bb2..6169b7de27 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,67 @@
+name: Linux GitHub CI
+
+on: [pull_request,push,workflow_dispatch]
+
+env:
+  MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx512m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS
+  TAKARI_SMART_BUILDER_VERSION: 0.6.1
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            jdk: 8
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        # 500 commits, set to 0 to get all
+        fetch-depth: 500
+        submodules: 'recursive'
+        show-progress: 'false'
+    - name: Set up JDK
+      uses: actions/setup-java@v3.12.0
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.jdk }}
+        cache: 'maven'
+    - name: Build with Maven
+      run: mvn -B -V install -DskipTests=true -Dmaven.javadoc.skip=true
+    - name: Remove SNAPSHOT jars from repository
+      run: |
+        find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
+    - name: Remove Schema 3.8 jars from repository
+      run: |
+        find ~/.m2/repository -name "*3.8*" -type d | xargs rm -rf {}
+
+  QA:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        # 500 commits, set to 0 to get all
+        fetch-depth: 500
+        submodules: 'recursive'
+        show-progress: 'false'
+    - name: Set up JDK
+      uses: actions/setup-java@v3.12.0
+      with:
+        distribution: 'temurin'
+        java-version: 8
+        cache: 'maven'
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v4
+      with:
+        maven-version: 3.6.3
+    - name: Test with maven
+      run: |
+        mvn resources:resources@copy-index-schema-to-source -f web
+        mvn -B -V -fae verify -Pit
+    - name: Remove SNAPSHOT jars from repository
+      run: |
+        find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}
+    - name: Remove Schema 3.8 jars from repository
+      run: |
+        find ~/.m2/repository -name "*3.8*" -type d | xargs rm -rf {}
diff --git a/core/pom.xml b/core/pom.xml
index e05b8180e9..7080b4b325 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -128,18 +128,6 @@
       <artifactId>log4j-core</artifactId>
       <version>${log4j2.version}</version>
     </dependency>
-    <!-- bridge java util logging api based on logging.properties -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-jul</artifactId>
-      <version>${log4j2.version}</version>
-    </dependency>
-    <!-- bridge slf4j api for testig wtih apacheds -->
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- log4j 2 logging configured via log4j2.xml -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -454,19 +442,10 @@
       <groupId>com.github.librepdf</groupId>
       <artifactId>openpdf</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.github.librepdf</groupId>
-      <artifactId>openpdf</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mapfish.print</groupId>
       <artifactId>print-lib</artifactId>
       <exclusions>
-        <exclusion>
-          <!-- provided by openpdf -->
-          <groupId>com.itextpdf</groupId>
-          <artifactId>itextpdf</artifactId>
-        </exclusion>
         <exclusion>
           <!-- provided by openpdf -->
           <groupId>com.itextpdf</groupId>
diff --git a/core/src/main/java/jeeves/config/springutil/JeevesNodeAwareLogoutSuccessHandler.java b/core/src/main/java/jeeves/config/springutil/JeevesNodeAwareLogoutSuccessHandler.java
index 9c61ff3a74..8442c90959 100644
--- a/core/src/main/java/jeeves/config/springutil/JeevesNodeAwareLogoutSuccessHandler.java
+++ b/core/src/main/java/jeeves/config/springutil/JeevesNodeAwareLogoutSuccessHandler.java
@@ -88,14 +88,14 @@ protected String determineTargetUrl(HttpServletRequest request, HttpServletRespo
 
                     String siteHost = settingManager.getValue(Settings.SYSTEM_SERVER_HOST);
                     String siteProtocol = settingManager.getValue(Settings.SYSTEM_SERVER_PROTOCOL);
-
+                    
                     // some conditional logic to handle the case where there's no port in the settings
                     SettingInfo si = new SettingInfo();
-                    int sitePort = si.getSitePort();
+                    int sitePort = si.getSitePort(); 
 
                     if (!hostName.equalsIgnoreCase(siteHost) ||
-                            !protocol.equalsIgnoreCase(siteProtocol) ||
-                            port != sitePort) {
+                        !protocol.equalsIgnoreCase(siteProtocol) ||
+                        port != sitePort) {
                         urlPatternValue = getDefaultTargetUrl();
                     }
                 } catch (MalformedURLException e) {
diff --git a/core/src/main/java/org/fao/geonet/kernel/AccessManager.java b/core/src/main/java/org/fao/geonet/kernel/AccessManager.java
index 46e8b17e3c..4c8820b248 100644
--- a/core/src/main/java/org/fao/geonet/kernel/AccessManager.java
+++ b/core/src/main/java/org/fao/geonet/kernel/AccessManager.java
@@ -23,7 +23,6 @@
 
 package org.fao.geonet.kernel;
 
-import static org.fao.geonet.kernel.setting.Settings.SYSTEM_METADATAPRIVS_PUBLICATIONBYGROUPOWNERONLY;
 import jeeves.server.UserSession;
 import jeeves.server.context.ServiceContext;
 import org.apache.commons.lang.StringUtils;
diff --git a/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java b/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
index ab467a227e..7d3403a208 100644
--- a/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
+++ b/core/src/main/java/org/fao/geonet/kernel/GeonetworkDataDirectory.java
@@ -210,6 +210,17 @@ public static File getLogfile() {
         return Log.getLogfile();
     }
 
+    /**
+     * Logfile location as determined from appender, or system property, or default.
+     * <p>
+     * Note this code is duplicated with the deprecated {@code LogConfig}.
+     *
+     * @return logfile location, or {@code null} if unable to determine
+     */
+    public static File getLogfile() {
+        return Log.getLogfile();
+    }
+
     /**
      * Determines the location of a property based on the
      * following lookup mechanism:
diff --git a/core/src/main/java/org/fao/geonet/kernel/Thesaurus.java b/core/src/main/java/org/fao/geonet/kernel/Thesaurus.java
index 7b819e6c76..d9937ed895 100644
--- a/core/src/main/java/org/fao/geonet/kernel/Thesaurus.java
+++ b/core/src/main/java/org/fao/geonet/kernel/Thesaurus.java
@@ -125,9 +125,6 @@ public class Thesaurus {
     private Cache<String, Object> THESAURUS_SEARCH_CACHE;
 
 
-    private Cache<String, Object> THESAURUS_SEARCH_CACHE;
-
-
     /**
      * Available for subclasses.
      */
diff --git a/core/src/main/java/org/fao/geonet/kernel/datamanager/base/BaseMetadataManager.java b/core/src/main/java/org/fao/geonet/kernel/datamanager/base/BaseMetadataManager.java
index 0c2bad2f03..61ba225106 100644
--- a/core/src/main/java/org/fao/geonet/kernel/datamanager/base/BaseMetadataManager.java
+++ b/core/src/main/java/org/fao/geonet/kernel/datamanager/base/BaseMetadataManager.java
@@ -49,7 +49,6 @@
 import org.fao.geonet.kernel.schema.SchemaPlugin;
 import org.fao.geonet.kernel.search.EsSearchManager;
 import org.fao.geonet.kernel.search.IndexingMode;
-import org.fao.geonet.kernel.search.IndexingMode;
 import org.fao.geonet.kernel.search.index.BatchOpsMetadataReindexer;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.kernel.setting.Settings;
@@ -742,7 +741,8 @@ public synchronized AbstractMetadata updateMetadata(final ServiceContext context
             session.removeProperty(Geonet.Session.VALIDATION_REPORT + metadataId);
         }
         String schema = metadataSchemaUtils.getMetadataSchema(metadataId);
-final AbstractMetadata metadata = metadataUtils.findOne(metadataId);
+
+        final AbstractMetadata metadata = metadataUtils.findOne(metadataId);
 
         if (updateDateStamp) {
             if (StringUtils.isEmpty(changeDate)) {
@@ -752,6 +752,7 @@ public synchronized AbstractMetadata updateMetadata(final ServiceContext context
                 metadata.getDataInfo().setChangeDate(new ISODate(changeDate));
             }
         }
+
         String uuidBeforeUfo = null;
         if (ufo) {
             String parentUuid = null;
diff --git a/core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java b/core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java
index f6fec5105f..746b9d8cc1 100644
--- a/core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java
+++ b/core/src/main/java/org/fao/geonet/kernel/search/EsSearchManager.java
@@ -212,7 +212,7 @@ private void addMDFields(Element doc, Path schemaDir,
                              IndexingMode indexingMode) {
         final Path styleSheet = getXSLTForIndexing(schemaDir, metadataType);
         try {
-            Map<String, Object> indexParams = new HashMap<String, Object>();
+            Map<String, Object> indexParams = new HashMap<>();
             indexParams.put("fastIndexMode", indexingMode.equals(IndexingMode.core));
 
             Element fields = Xml.transform(metadata, styleSheet, indexParams);
diff --git a/core/src/main/java/org/fao/geonet/kernel/security/openidconnect/OidcUser2GeonetworkUser.java b/core/src/main/java/org/fao/geonet/kernel/security/openidconnect/OidcUser2GeonetworkUser.java
index af9c456f8e..3c0cf6f3d7 100644
--- a/core/src/main/java/org/fao/geonet/kernel/security/openidconnect/OidcUser2GeonetworkUser.java
+++ b/core/src/main/java/org/fao/geonet/kernel/security/openidconnect/OidcUser2GeonetworkUser.java
@@ -161,9 +161,6 @@ public UserDetails getUserDetails(OidcIdToken idToken, Map attributes, boolean w
      */
     //from keycloak
     protected void updateGroups(Map<Profile, List<String>> profileGroups, User user) {
-        // First we remove all previous groups
-        userGroupRepository.deleteAll(UserGroupSpecs.hasUserId(user.getId()));
-
         Set<UserGroup> userGroups = new HashSet<>();
 
         // Now we add the groups
diff --git a/core/src/test/java/org/fao/geonet/kernel/LocalXLinksInMetadataIntegrationTest.java b/core/src/test/java/org/fao/geonet/kernel/LocalXLinksInMetadataIntegrationTest.java
index 59be77bf04..5b141a82cb 100644
--- a/core/src/test/java/org/fao/geonet/kernel/LocalXLinksInMetadataIntegrationTest.java
+++ b/core/src/test/java/org/fao/geonet/kernel/LocalXLinksInMetadataIntegrationTest.java
@@ -110,8 +110,6 @@ public void testResolveLocalXLink() throws Exception {
         String id = _dataManager.insertMetadata(context, schema, metadata, uuid, owner, groupOwner, source, metadataType, null,
             null, createDate, changeDate, false, IndexingMode.none);
 
-        SpringLocalServiceInvoker mockInvoker = resetAndGetMockInvoker();
-
         String keyword1 = "World";
         Element element1 = new SAXBuilder().build(new StringReader(String.format(responseTemplate, keyword1))).getRootElement();
         when(springLocalServiceInvoker.invoke(any(String.class))).thenReturn(element1);
diff --git a/csw-server/src/main/java/org/fao/geonet/component/csw/Transaction.java b/csw-server/src/main/java/org/fao/geonet/component/csw/Transaction.java
index e5e174bc20..f571bb968b 100644
--- a/csw-server/src/main/java/org/fao/geonet/component/csw/Transaction.java
+++ b/csw-server/src/main/java/org/fao/geonet/component/csw/Transaction.java
@@ -23,8 +23,6 @@
 
 package org.fao.geonet.component.csw;
 
-import org.fao.geonet.kernel.search.IndexingMode;
-import org.locationtech.jts.util.Assert;
 import jeeves.server.UserSession;
 import jeeves.server.context.ServiceContext;
 import org.fao.geonet.ApplicationContextHolder;
@@ -360,6 +358,7 @@ private int updateTransaction(Element request, Element xml, ServiceContext conte
             }
 
             beforeMetadata = metadataUtils.findOneByUuid(uuid).getXmlData(false);
+
             String language = context.getLanguage();
             dataMan.updateMetadata(context, id, xml,
                 applyValidation, applyUpdateFixedInfo,
diff --git a/docs/manual/overrides/.icons/.DS_Store b/docs/manual/overrides/.icons/.DS_Store
new file mode 100644
index 0000000000..f215feb303
Binary files /dev/null and b/docs/manual/overrides/.icons/.DS_Store differ
diff --git a/docs/manual/pom.xml b/docs/manual/pom.xml
index ce640cbbb1..ddf7357a22 100644
--- a/docs/manual/pom.xml
+++ b/docs/manual/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <artifactId>gn-docs</artifactId>
     <groupId>org.geonetwork-opensource</groupId>
-    <version>4.2.6-0</version>
+    <version>4.2.6-georchestra</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gn-guide</artifactId>
diff --git a/doi/src/main/java/org/fao/geonet/doi/client/DoiClient.java b/doi/src/main/java/org/fao/geonet/doi/client/DoiClient.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java b/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java
index 99ba085056..87871c21d7 100644
--- a/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java
+++ b/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java
@@ -301,11 +301,6 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
                 .withDescriptionKey("exception.doi.missingSavedquery.description",
                     new String[]{ metadata.getUuid(), schema.getName(),
                     SavedQuery.DOI_GET, e.getMessage(),
-                    schema.getName() })
-                .withMessageKey("exception.doi.missingSavedquery")
-                .withDescriptionKey("exception.doi.missingSavedquery.description",
-                    new String[]{ metadata.getUuid(), schema.getName(),
-                    DOI_GET_SAVED_QUERY, e.getMessage(),
                     schema.getName() });
         }
     }
diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java
index b7bc3247d7..bec3d2cda1 100644
--- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java
+++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java
@@ -26,7 +26,6 @@
 import jeeves.server.UserSession;
 import jeeves.server.context.ServiceContext;
 import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.ThreadContext;
 import org.fao.geonet.Logger;
 import org.fao.geonet.constants.Geonet;
 import org.fao.geonet.csw.common.exceptions.InvalidParameterValueEx;
@@ -606,6 +605,7 @@ protected OperResult harvest() {
                 cancelMonitor.set(false);
                 try {
                     String logfile = LogUtil.initializeHarvesterLog(getType(), this.getParams().getName());
+
                     this.log.info("Starting harvesting of " + this.getParams().getName());
                     error = null;
                     errors.clear();
diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java
index e0ea47b0f4..b7f4ac58be 100644
--- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java
+++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Aligner.java
@@ -43,7 +43,6 @@
 import org.fao.geonet.kernel.harvest.harvester.*;
 import org.fao.geonet.kernel.mef.*;
 import org.fao.geonet.kernel.search.IndexingMode;
-import org.fao.geonet.kernel.search.IndexingMode;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.kernel.setting.Settings;
 import org.fao.geonet.repository.GroupRepository;
diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleUrl/Aligner.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleUrl/Aligner.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index c00bed3fb8..a0e5f8e69a 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -60,7 +60,7 @@
 
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j18-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
       <version>${log4j2.version}</version>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 7ebc810090..99943707c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,8 @@
       <post>geonetwork-users-fr@lists.sourceforge.net</post>
       <subscribe>https://lists.sourceforge.net/lists/listinfo/geonetwork-users-fr</subscribe>
       <unsubscribe>https://lists.sourceforge.net/lists/options/geonetwork-users-fr</unsubscribe>
-      <archive>http://osgeo-org.1560.x6.nabble.com/GeoNetwork-users-francophone-f3880536.html</archive>
+      <archive>http://osgeo-org.1560.x6.nabble.com/GeoNetwork-users-francophone-f3880536.html
+      </archive>
     </mailingList>
     <mailingList>
       <name>Usuarios (es)</name>
@@ -228,6 +229,10 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.1</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
@@ -260,10 +265,8 @@
           <compilerVersion>1.8</compilerVersion>
           <debug>true</debug>   <!-- Whether to include debugging information.   -->
           <encoding>UTF-8</encoding> <!-- The -encoding argument for the Java compiler. -->
-          <compilerArgs>
-            <!-- disable automatic annotation processing according to: http://docs.jboss.org/hibernate/jpamodelgen/1.0/reference/en-US/html_single/#d0e261 -->
-            <arg>-proc:none</arg>
-          </compilerArgs>
+          <compilerArgument>-proc:none
+          </compilerArgument> <!-- disable automatic annotation processing accoring to: http://docs.jboss.org/hibernate/jpamodelgen/1.0/reference/en-US/html_single/#d0e261 -->
         </configuration>
       </plugin>
 
@@ -529,12 +532,9 @@
         <version>1.10</version>
       </dependency>
       <!-- logging -->
-      <dependency> <!-- usedf for camel -->
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-slf4j18-impl</artifactId>
-        <version>${log4j2.version}</version>
-      </dependency>
-      <dependency> <!-- used for LDAP test dependency in core -->
+      <dependency>
+        <!-- usedf for camel -->
+        <!-- used for LDAP test dependency in core -->
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
         <version>${log4j2.version}</version>
@@ -649,6 +649,11 @@
         <artifactId>gt-xsd-gml3</artifactId>
         <version>${geotools.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.geotools.xsd</groupId>
+        <artifactId>gt-xsd-fes</artifactId>
+        <version>${geotools.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.geotools.xsd</groupId>
         <artifactId>gt-xsd-core</artifactId>
@@ -691,11 +696,6 @@
         <artifactId>gt-xsd-wfs</artifactId>
         <version>${geotools.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.geotools.xsd</groupId>
-        <artifactId>gt-xsd-fes</artifactId>
-        <version>${geotools.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.geotools</groupId>
         <artifactId>gt-epsg-extension</artifactId>
@@ -924,14 +924,6 @@
         <scope>test</scope>
       </dependency>
 
-      <!-- other stuff -->
-      <dependency>
-        <groupId>org.apache.directory.server</groupId>
-        <artifactId>apacheds-all</artifactId>
-        <version>2.0.0-M24</version>
-        <scope>test</scope>
-      </dependency>
-
       <!-- other stuff -->
       <dependency>
         <groupId>com.h2database</groupId>
@@ -966,20 +958,15 @@
          <!-- Oracle Free Use Terms and Conditions (FUTC) -->
        </dependency>
       <dependency>
-        <groupId>org.jsoup</groupId>
-        <artifactId>jsoup</artifactId>
-        <version>1.14.3</version>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>com.neovisionaries</groupId>
         <artifactId>nv-i18n</artifactId>
         <version>1.29</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
@@ -1178,7 +1165,7 @@
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
-        <version>2.3.0</version>
+        <version>2.2.11</version>
       </dependency>
       <dependency>
         <groupId>org.elasticsearch.client</groupId>
@@ -1326,52 +1313,9 @@
     <module>messaging</module>
     <module>estest</module>
     <module>index</module>
-    <module>georchestra-integration</module>
   </modules>
 
   <profiles>
-    <profile>
-      <id>jdk11+</id>
-      <activation>
-        <jdk>[11,)</jdk>
-      </activation>
-      <properties>
-        <java.version>11</java.version>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <source>11</source>
-              <target>11</target>
-              <debug>true</debug>   <!-- Whether to include debugging information.   -->
-              <encoding>UTF-8</encoding> <!-- The -encoding argument for the Java compiler. -->
-              <compilerArgs>
-                <arg>-proc:none</arg>
-                <arg>--add-exports</arg>
-                <arg>java.base/sun.net.ftp=ALL-UNNAMED</arg>
-              </compilerArgs> <!-- disable automatic annotation processing according to: http://docs.jboss.org/hibernate/jpamodelgen/1.0/reference/en-US/html_single/#d0e261 -->
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <!-- force use of java 8 if available in toolchains.xml -->
       <id>toolchain</id>
@@ -1491,6 +1435,8 @@
     <application.name>geonetwork</application.name>
     <app.properties>WEB-INF/config.properties</app.properties>
     <!--<app.properties>file:/${geonetwork.dir}/config.properties</app.properties>-->
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <!-- Configure database config file to use. Could be
      h2, postgres, sqlserver, mysql, oracle, db2, postgres-postgis, jndi
      -->
@@ -1505,10 +1451,9 @@
         GEONETWORK_DB_CONNECTION_PROPERTIES=
     -->
 
-
-   <!--  <db.type>${geonetwork.db.type:postgres-postgis}</db.type> -->
+    <db.type>${geonetwork.db.type:h2}</db.type>
     <!-- Instead of using db_type a specific config file can be specified -->
-    <db.config.file>../config-db/postgres-postgis.xml</db.config.file>
+    <db.config.file>../config-db/${db.type}.xml</db.config.file>
     <db.host>#{systemEnvironment['GEONETWORK_DB_HOST']?:'localhost'}</db.host>
     <db.port>#{systemEnvironment['GEONETWORK_DB_PORT']}</db.port>
     <db.name>#{systemEnvironment['GEONETWORK_DB_NAME']?:'~/gn'}</db.name>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
index c00ff22be6..abb49d9377 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
@@ -192,7 +192,8 @@
                   <span class="badge"><xsl:copy-of select="."/></span>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a class="btn btn-default btn-xs"href='#/search?query_string=%7B"tag.\\*":%7B"{.}":true%7D%7D'>
+                  <a class="btn btn-default btn-xs"
+                     href='#/search?query_string=%7B"tag.\\*":%7B"{.}":true%7D%7D'>
                     <xsl:copy-of select="."/>
                   </a>
                 </xsl:otherwise>
@@ -200,8 +201,7 @@
             </xsl:for-each>
           </xsl:otherwise>
         </xsl:choose>
-  </section>
-    </xsl:if>
+      </section>
     </xsl:if>
   </xsl:template>
 
@@ -257,18 +257,19 @@
         <xsl:for-each select="mdb:identificationInfo/*/mri:graphicOverview/*">
           <div>
             <img data-gn-img-modal="md"
-               class="gn-img-thumbnail center-block"
-               alt="{$schemaStrings/overview}"
-               src="{mcc:fileName/*}"onerror="{$imgOnError}"/>
-
-          <xsl:for-each select="mcc:fileDescription">
-            <div class="gn-img-thumbnail-caption">
-              <xsl:call-template name="get-iso19115-3.2018-localised">
-                <xsl:with-param name="langId" select="$langId"/>
-              </xsl:call-template>
-            </div>
-          </xsl:for-each>
-        </div>
+                 class="gn-img-thumbnail center-block"
+                 alt="{$schemaStrings/overview}"
+                 src="{mcc:fileName/*}"
+                 onerror="{$imgOnError}"/>
+
+            <xsl:for-each select="mcc:fileDescription">
+              <div class="gn-img-thumbnail-caption">
+                <xsl:call-template name="get-iso19115-3.2018-localised">
+                  <xsl:with-param name="langId" select="$langId"/>
+                </xsl:call-template>
+              </div>
+            </xsl:for-each>
+          </div>
         </xsl:for-each>
       </section>
     </xsl:if>
@@ -318,7 +319,7 @@
       select="mdb:identificationInfo/*/mri:citation/*/cit:otherCitationDetails"/>
       -->
       <xsl:choose>
-      <!-- Landing page case -->
+        <!-- Landing page case -->
         <xsl:when test="$language = 'all'">
 
           <xsl:variable name="citationInfo">
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
index 59faa4af1f..2fd90f1191 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
@@ -321,14 +321,14 @@
               data-variables="cit:role/cit:CI_RoleCode/@codeListValue~{role}"/>
     </for>
 
-    <for name="mdb:referenceSystemInfo" addDirective="data-gn-directory-entry-selector">
+    <!--<for name="mdb:referenceSystemInfo" addDirective="data-gn-directory-entry-selector">
       <directiveAttributes
         data-template-add-action="true"
         data-search-action="true"
         data-template-type="CRS"
         data-filter='{"root": "mrs:MD_ReferenceSystem"}'
         data-insert-modes=""/>
-    </for>
+    </for>-->
 
 
     <for name="mri:extent" addDirective="data-gn-directory-entry-selector">
diff --git a/services/src/main/java/org/fao/geonet/api/records/MetadataInsertDeleteApi.java b/services/src/main/java/org/fao/geonet/api/records/MetadataInsertDeleteApi.java
index 837192ec1b..0c7c8388d8 100644
--- a/services/src/main/java/org/fao/geonet/api/records/MetadataInsertDeleteApi.java
+++ b/services/src/main/java/org/fao/geonet/api/records/MetadataInsertDeleteApi.java
@@ -982,13 +982,6 @@ private Pair<Integer, String> loadRecord(MetadataType metadataType, Element xmlE
             metadataValidator.doValidate(metadata, context.getLanguage());
         }
 
-        if (rejectIfInvalid) {
-            // Persist the validation status
-            AbstractMetadata metadata = metadataRepository.findOneById(iId);
-
-            metadataValidator.doValidate(metadata, context.getLanguage());
-        }
-
         dataManager.indexMetadata(id.get(0), true);
         return Pair.read(Integer.valueOf(id.get(0)), uuid);
     }
@@ -1011,24 +1004,6 @@ private void checkUserProfileToImportMetadata(UserSession userSession) {
 
     }
 
-    /**
-     * Checks if the user profile is allowed to import metadata.
-     *
-     * @param userSession
-     */
-    private void checkUserProfileToDeletePublishedMetadata(UserSession userSession) {
-        if (userSession.getProfile() != Profile.Administrator) {
-            String allowedUserProfileToImportMetadata =
-                StringUtils.defaultIfBlank(settingManager.getValue(Settings.METADATA_PUBLISHED_DELETE_USERPROFILE), Profile.Editor.toString());
-
-            // Is the user profile is higher than the profile allowed to import metadata?
-            if (!hasHierarchyRole(allowedUserProfileToImportMetadata, this.roleHierarchy)) {
-                throw new NotAllowedException("The user has no permissions to delete published metadata.");
-            }
-        }
-
-    }
-
     /**
      * Checks if the user profile is allowed to import metadata.
      *
diff --git a/services/src/main/java/org/fao/geonet/api/records/MetadataUtils.java b/services/src/main/java/org/fao/geonet/api/records/MetadataUtils.java
index 633588e205..89ec9b7ab0 100644
--- a/services/src/main/java/org/fao/geonet/api/records/MetadataUtils.java
+++ b/services/src/main/java/org/fao/geonet/api/records/MetadataUtils.java
@@ -742,38 +742,6 @@ private static Element getRecord(String uuid, ServiceContext context, DataManage
         return content;
     }
 
-    public static void backupRecord(AbstractMetadata metadata, ServiceContext context) {
-        Log.trace(Geonet.DATA_MANAGER, "Backing up record " + metadata.getId());
-        Path outDir = Lib.resource.getRemovedDir(metadata.getId());
-        Path outFile;
-        try {
-            // When metadata records contains character not supported by filesystem
-            // it may be an issue. eg. acri-st.fr/96443
-            outFile = outDir.resolve(URLEncoder.encode(metadata.getUuid(), Constants.ENCODING) + ".zip");
-        } catch (UnsupportedEncodingException e1) {
-            outFile = outDir.resolve(String.format(
-                "backup-%s-%s.mef",
-                new Date(), metadata.getUuid()));
-        }
-
-        Path file = null;
-        try {
-            file = MEFLib.doExport(context, metadata.getUuid(), "full", false, true, false, false, true);
-            Files.createDirectories(outDir);
-            try (InputStream is = IO.newInputStream(file);
-                 OutputStream os = Files.newOutputStream(outFile)) {
-                BinaryFile.copy(is, os);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("Error performing backup on record '" + metadata.getUuid() + "'. Contact the system administrator if the problem persists: " + e.getMessage(), e);
-        } finally {
-            if (file != null) {
-                IO.deleteFile(file, false, Geonet.MEF);
-            }
-        }
-    }
-
-
     /**
      * Returns the metadata validation status from the database, calculating/storing the validation if not stored.
      *
diff --git a/services/src/main/java/org/fao/geonet/api/site/LogUtils.java b/services/src/main/java/org/fao/geonet/api/site/LogUtils.java
index 22916ad274..4c96a564e7 100644
--- a/services/src/main/java/org/fao/geonet/api/site/LogUtils.java
+++ b/services/src/main/java/org/fao/geonet/api/site/LogUtils.java
@@ -23,7 +23,6 @@
 
 package org.fao.geonet.api.site;
 
-import net.bytebuddy.pool.TypePool;
 import org.apache.log4j.xml.DOMConfigurator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -33,13 +32,10 @@
 import org.fao.geonet.exceptions.OperationAbortedEx;
 import org.fao.geonet.kernel.setting.Settings;
 import org.fao.geonet.repository.SettingRepository;
-import org.springframework.beans.BeansException;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.file.Paths;
 import java.util.Optional;
 
 /**
diff --git a/services/src/main/java/org/fao/geonet/api/site/LoggingApi.java b/services/src/main/java/org/fao/geonet/api/site/LoggingApi.java
index c24332baaa..23aa1cc388 100644
--- a/services/src/main/java/org/fao/geonet/api/site/LoggingApi.java
+++ b/services/src/main/java/org/fao/geonet/api/site/LoggingApi.java
@@ -26,7 +26,6 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.io.IOUtils;
-import org.fao.geonet.ApplicationContextHolder;
 import org.fao.geonet.api.site.model.ListLogFilesResponse;
 import org.fao.geonet.kernel.GeonetworkDataDirectory;
 import org.fao.geonet.util.FileUtil;
@@ -89,15 +88,8 @@ public List<ListLogFilesResponse.LogFileResponse> getLogFiles(
     ) throws Exception {
         java.util.List<ListLogFilesResponse.LogFileResponse> logFileList =
             new ArrayList<>();
-        String loggingConfigurationFolder = dataDirectory.getWebappDir() + "/WEB-INF/classes";
-        // overrides if a "loggingConfigurationPath" bean is available
-        try {
-            loggingConfigurationFolder = (String) ApplicationContextHolder.get().getBean("loggingConfigurationPath");
-        } catch (Exception e) {
-            // stick with the folder in the classpath.
-        }
-
-        File folder = new File(loggingConfigurationFolder);
+        String classesFolder = dataDirectory.getWebappDir() + "/WEB-INF/classes";
+        File folder = new File(classesFolder);
 
         if (folder != null && folder.isDirectory()) {
             Pattern pattern = Pattern.compile(regexp, Pattern.CASE_INSENSITIVE);
diff --git a/services/src/test/java/org/fao/geonet/api/records/extent/MetadataExtentApiTest.java b/services/src/test/java/org/fao/geonet/api/records/extent/MetadataExtentApiTest.java
index 5e77ab4277..11508b137f 100644
--- a/services/src/test/java/org/fao/geonet/api/records/extent/MetadataExtentApiTest.java
+++ b/services/src/test/java/org/fao/geonet/api/records/extent/MetadataExtentApiTest.java
@@ -126,7 +126,7 @@ public void getOneRecordExtentAsImage() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
 
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName());
-        assertEquals("a50d8f6a997196220c53f17ec7208e9f", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("0a2ea00341921f0c6e8b8997e3b87c14", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
     @Test
@@ -156,7 +156,7 @@ public void lastModifiedModified() throws Exception {
             .andExpect(content().contentType(API_PNG_EXPECTED_ENCODING))
             .andReturn().getResponse().getContentAsByteArray();
 
-        assertEquals("a50d8f6a997196220c53f17ec7208e9f", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("0a2ea00341921f0c6e8b8997e3b87c14", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
     @Test
@@ -173,7 +173,7 @@ public void aggregatedWithTwoExtent() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
 
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName());
-        assertEquals("76ddbcef8515da9c7282df2e87326216", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("5808105ac9395326b81e9d036a6f3e81", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
     @Test
@@ -198,7 +198,7 @@ public void twoExtentFirstOneWithBothBoundingBoxAndPolygon() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName() + "-1");
 
-        assertEquals("f67948f632c73da0d9f803c4ebc23837", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("b3e8eef2afbfc83c363119f6e8e613e2", DigestUtils.md5DigestAsHex(reponseBuffer));
 
         reponseBuffer = mockMvc.perform(get(String.format("/srv/api/records/%s/extents/2.png", uuid))
             .session(mockHttpSession)
@@ -208,7 +208,7 @@ public void twoExtentFirstOneWithBothBoundingBoxAndPolygon() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName() + "-2");
 
-        assertEquals("6e3dce78985748504058eb89c690a0bf", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("cfe247f701d64118453981245c793972", DigestUtils.md5DigestAsHex(reponseBuffer));
 
         reponseBuffer = mockMvc.perform(get(String.format("/srv/api/records/%s/extents/3.png", uuid))
             .session(mockHttpSession)
@@ -218,7 +218,7 @@ public void twoExtentFirstOneWithBothBoundingBoxAndPolygon() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName() + "-3");
 
-        assertEquals("d69a05542cf41eb63b633dbd79b9c6ac", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("25812922c1f5f660d922e80a1ccc3689", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
 
@@ -244,7 +244,7 @@ public void threeExtentThirdOne() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
 
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName());
-        assertEquals("ac1cfd40a4c9600c6cd8951bdc9cf201", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("0d28fdd025cb58cd50a5fa7c1f43995c", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
     @Test
@@ -269,7 +269,7 @@ public void threeExtentThirdOne115_3() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
 
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName());
-        assertEquals("860aa9005026571e3a0428546e411771", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("d4d930688949095e2cd41996113a1455", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
     @Test
@@ -286,7 +286,7 @@ public void threeExtentThirdOneIsABoundingBox() throws Exception {
             .andReturn().getResponse().getContentAsByteArray();
 
         saveImageToDiskIfConfiguredToDoSo(reponseBuffer, name.getMethodName());
-        assertEquals("d69a05542cf41eb63b633dbd79b9c6ac", DigestUtils.md5DigestAsHex(reponseBuffer));
+        assertEquals("25812922c1f5f660d922e80a1ccc3689", DigestUtils.md5DigestAsHex(reponseBuffer));
     }
 
     private String createTestData() throws Exception {
diff --git a/web-ui/pom.xml b/web-ui/pom.xml
index 08b0757cc5..ed0da4f910 100644
--- a/web-ui/pom.xml
+++ b/web-ui/pom.xml
@@ -118,40 +118,4 @@
     </geonetwork.build.dir>
     <closure.compile.level/>
   </properties>
-  <profiles>
-    <profile>
-      <id>tests-and-static-analysis</id>
-      <activation>
-        <property>
-          <name>!skipTests</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.github.searls</groupId>
-            <artifactId>jasmine-maven-plugin</artifactId>
-            <version>1.3.1.3</version>
-            <executions>
-              <execution>
-                <id>jasmine-javascript-tests</id>
-                <phase>test</phase>
-                <!-- disable for now
-                                               <goals>
-                                                    <goal>test</goal>
-                                                </goals> -->
-              </execution>
-            </executions>
-            <configuration>
-              <preloadSources></preloadSources>
-              <jsSrcDir>${project.basedir}/src/main/resources/catalog/js</jsSrcDir>
-              <jsTestSrcDir>${project.basedir}/src/test/jasmine</jsTestSrcDir>
-              <browserVersion>INTERNET_EXPLORER_9</browserVersion>
-              <debug>true</debug>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/web-ui/src/main/resources/catalog/components/common/map/print/PrintDirective.js b/web-ui/src/main/resources/catalog/components/common/map/print/PrintDirective.js
index bd0a25e1cb..c931fbd411 100644
--- a/web-ui/src/main/resources/catalog/components/common/map/print/PrintDirective.js
+++ b/web-ui/src/main/resources/catalog/components/common/map/print/PrintDirective.js
@@ -108,6 +108,7 @@
         var http = $http.get($scope.options.printConfigUrl);
         http.then(function (response) {
           var data = response.data;
+
           $scope.capabilities = data;
 
           // default values:
diff --git a/web-ui/src/main/resources/catalog/components/common/map/print/PrintMapDirective.js b/web-ui/src/main/resources/catalog/components/common/map/print/PrintMapDirective.js
index 7b4d8e529c..1c9deec232 100644
--- a/web-ui/src/main/resources/catalog/components/common/map/print/PrintMapDirective.js
+++ b/web-ui/src/main/resources/catalog/components/common/map/print/PrintMapDirective.js
@@ -97,6 +97,7 @@
       var http = $http.get(options.printConfigUrl);
       http.then(function (response) {
         var data = response.data;
+
         // default values:
         var layout = data.layouts[0];
         if ($scope.defaultLayout) {
diff --git a/web-ui/src/main/resources/catalog/components/common/ows/OWSService.js b/web-ui/src/main/resources/catalog/components/common/ows/OWSService.js
index 411e75e4f0..d4f963e3c9 100644
--- a/web-ui/src/main/resources/catalog/components/common/ows/OWSService.js
+++ b/web-ui/src/main/resources/catalog/components/common/ows/OWSService.js
@@ -335,17 +335,20 @@
                     cache: true,
                     timeout: timeout
                   })
-                  .then(function (response) {
+                  .then(
+                    function (response) {
                       var data = response.data;
-                    if (data) {
-                      defer.resolve(parseWMTSCapabilities(data));
-                    } else {
-                      defer.reject();
+
+                      if (data) {
+                        defer.resolve(parseWMTSCapabilities(data));
+                      } else {
+                        defer.reject();
+                      }
+                    },
+                    function (response) {
+                      defer.reject(response.status);
                     }
-                  },
-                  function (response) {
-                    defer.reject(response.status);
-                  });
+                  );
               }
             }
             return defer.promise;
@@ -370,7 +373,7 @@
                   })
                   .then(
                     function (response) {
-                    var xfsCap = parseWFSCapabilities(response.data);
+                      var xfsCap = parseWFSCapabilities(response.data);
 
                       if (!xfsCap || xfsCap.exception != undefined) {
                         defer.reject({
@@ -408,7 +411,7 @@
                   })
                   .then(
                     function (response) {
-                    var xfsCap = parseWCSCapabilities(response.data);
+                      var xfsCap = parseWCSCapabilities(response.data);
 
                       if (!xfsCap || xfsCap.exception != undefined) {
                         defer.reject({
@@ -585,7 +588,6 @@
                 name == layers[i].name.localPart ||
                 name == layers[i].name.prefix + ":" + layers[i].name.localPart ||
                 name == layers[i].Name
-
               ) {
                 needles.push(layers[i]);
                 continue;
diff --git a/web-ui/src/main/resources/catalog/components/common/savedselections/SavedSelectionsDirective.js b/web-ui/src/main/resources/catalog/components/common/savedselections/SavedSelectionsDirective.js
index 55715735b1..9862ed92e3 100644
--- a/web-ui/src/main/resources/catalog/components/common/savedselections/SavedSelectionsDirective.js
+++ b/web-ui/src/main/resources/catalog/components/common/savedselections/SavedSelectionsDirective.js
@@ -442,14 +442,15 @@
         }
 
         scope.$watch(
-          "user", function (n, o) {
-          if (n !== o || scope.selections === null) {
-            scope.selections = null;
-            controller.getSelections(scope.user).then(function (selections) {
-              scope.selections = selections;
-            });
-          }
-        },
+          "user",
+          function (n, o) {
+            if (n !== o || scope.selections === null) {
+              scope.selections = null;
+              controller.getSelections(scope.user).then(function (selections) {
+                scope.selections = selections;
+              });
+            }
+          },
           true
         );
 
diff --git a/web-ui/src/main/resources/catalog/components/common/scrollspy/partials/scrollspy.html b/web-ui/src/main/resources/catalog/components/common/scrollspy/partials/scrollspy.html
index 73a39ac3ef..3ec5ec7e00 100644
--- a/web-ui/src/main/resources/catalog/components/common/scrollspy/partials/scrollspy.html
+++ b/web-ui/src/main/resources/catalog/components/common/scrollspy/partials/scrollspy.html
@@ -2,14 +2,14 @@
   <div class="btn-toolbar" role="toolbar">
     <!-- TODO: toggle icon when collapsed to fa-caret-square-o-up -->
     <button
-      class="btn btn-primary btn-round "
+      class="btn btn-primary btn-round"
       data-ng-click="toggle()"
       title="{{'toggleScrollSpy' | translate}}"
-
     >
       <i class="fa fa-bars"></i>
-    </button><button
-      class="btn btn-primary btn-round "
+    </button>
+    <button
+      class="btn btn-primary btn-round"
       data-ng-click="scrollTo()"
       title="{{'scrollTop' | translate}}"
     >
diff --git a/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html b/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html
index a26c08d1e5..408f7af54b 100644
--- a/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html
+++ b/web-ui/src/main/resources/catalog/components/edit/bounding/partials/boundingpolygon.html
@@ -54,8 +54,8 @@
               gi-btn="active"
               ng-model="ctrl.modifyInteraction.active"
 
-          >
-            <span class="fa fa-pencil"></span>&nbsp;
+
+          >  <span class="fa fa-pencil"></span>&nbsp;
             <span translate>modifyGeometry</span>
           </button>
         </div>
diff --git a/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js b/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js
index da23bfae4d..f91efaab94 100644
--- a/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/geopublisher/GeoPublisherDirective.js
@@ -272,7 +272,7 @@
                     scope.statusCode = response.data.description;
                     scope.isPublished = false;
                   }
-);
+                );
             };
 
             /**
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
index ff9bbc2568..6d0003da1d 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcService.js
@@ -140,8 +140,7 @@
 
           if (params.wmsResources.addLayerNamesMode == "resourcename") {
             angular.extend(params, {
-              name: names.join(","),
-              desc: descs.join(",")
+              name: names.join(",")
             });
           }
         }
@@ -210,7 +209,6 @@
             }
           );
         });
-        });
       };
 
       /**
@@ -715,12 +713,14 @@
          * @param {Object} onlinesrc the online resource to remove
          */
         removeOnlinesrc: function (onlinesrc) {
-var url = onlinesrc.lUrl || onlinesrc.url;
+          var url = onlinesrc.lUrl || onlinesrc.url;
           if (
             url.match(".*/api/records/' + gnCurrentEdit.uuid + '/attachments/.*") != null
           ) {
             url = gnUrlUtils.remove(url, ["approved"], true);
-          }          return runProcess(
+          }
+
+          return runProcess(
             this,
             setParams("onlinesrc-remove", {
               id: gnCurrentEdit.id,
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
index 17b5ff46ef..405682e079 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/addOnlinesrc.html
@@ -64,7 +64,10 @@
               data-ng-if="key === 'function' &&
                              !params.linkType.fields.function.hidden"
             >
-              <label id="gn-addonlinesrc-function-label" class="col-sm-2 control-label"data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.function.tooltip}}"
+              <label
+                id="gn-addonlinesrc-function-label"
+                class="col-sm-2 control-label"
+                data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.function.tooltip}}"
               >
                 <span data-translate="">onlineFunction</span>
               </label>
@@ -77,7 +80,6 @@
                   data-allow-blank="true"
                   data-selected-info="params.function"
                   data-gn-schema-info="function"
-
                   lang="lang"
                 ></div>
               </div>
@@ -94,7 +96,10 @@
               data-ng-if="key === 'protocol' &&
                              !params.linkType.fields.protocol.hidden"
             >
-              <label id="gn-addonlinesrc-protocol-label" class="col-sm-2 control-label"data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.protocol.tooltip}}"
+              <label
+                id="gn-addonlinesrc-protocol-label"
+                class="col-sm-2 control-label"
+                data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.protocol.tooltip}}"
               >
                 <span data-translate="">protocol</span>
               </label>
@@ -125,29 +130,7 @@
                 id="gn-addonlinesrc-mimeType-label"
                 class="col-sm-2 control-label"
                 data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.mimeType.tooltip}}"
-                 >
-                <span data-translate="">mimeType</span>
-              </label>
-              <div class="col-sm-9">
-                <input
-                  id="gn-addonlinesrc-mimeType-list"
-                  type="text"
-                  name="format"
-                  data-ng-model="params.mimeType"
-                />
-              </div>
-
-              <div class="col-sm-1 gn-control"></div>
-            </div>
-
-            <div
-              id="gn-addonlinesrc-mimeType-row"
-              class="form-group"
-              data-ng-class="{'gn-required': params.linkType.fields.mimeType.required }"
-              data-ng-if="key === 'mimeType' &&
-                             !params.linkType.fields.mimeType.hidden"
-            >
-              <label id="gn-addonlinesrc-mimeType-label" class="col-sm-2 control-label">
+              >
                 <span data-translate="">mimeType</span>
               </label>
               <div class="col-sm-9">
@@ -156,7 +139,6 @@
                   type="text"
                   name="format"
                   data-ng-model="params.mimeType"
-                  data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.mimeType.tooltip}}"
                 />
               </div>
               <div class="col-sm-1 gn-control"></div>
@@ -175,7 +157,8 @@
                   for="gn-addonlinesrc-url-list-single-input"
                   class="col-sm-2 control-label"
                   data-translate=""
-                  data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.url.tooltip}}">url</label
+                  data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.url.tooltip}}"
+                  >url</label
                 >
 
                 <div
@@ -186,14 +169,13 @@
                   current-language="ctrl.urlCurLang"
                   data-main-language="{{mdLang}}"
                   expanded="false"
-
-                >  <input
+                >
+                  <input
                     data-ng-repeat="(key, val) in mdLangs"
                     id="gn-addonlinesrc-url-{{val}}"
                     class="form-control input-sm"
                     lang="{{val}}"
                     ng-model-options="{debounce: 500}"
-
                     data-ng-model="params.url[val]"
                   />
                 </div>
@@ -215,7 +197,6 @@
                       type="text"
                       data-ng-blur="loadCurrentLink()"
                       id="gn-addonlinesrc-url-list-single-input"
-                      data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.url.tooltip}}"
                       placeholder="{{params.linkType.fields.url.placeholder || 'https://...'}}"
                     />
                     <span class="input-group-btn" data-ng-show="OGCProtocol != null">
@@ -353,7 +334,6 @@
                   class="form-control input-sm"
                   lang="{{val}}"
                   data-ng-model="params.name[val]"
-                  data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.name.tooltip}}"
                   data-ng-readonly='config.wmsResources.addLayerNamesMode ==
                 "resourcename" && OGCProtocol != null && isWMSProtocol()'
                 />
@@ -411,7 +391,6 @@
                     data-ng-model="params.desc[val]"
                     class="form-control input-sm"
                     placeholder="description"
-                    data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.desc.tooltip}}"
                     name="description"
                   />
                 </div>
@@ -445,7 +424,8 @@
                 for="gn-addonlinesrc-profile-input"
                 class="col-sm-2 control-label"
                 data-translate=""
-                data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.applicationProfile.tooltip}}">applicationProfile</label
+                data-gn-field-tooltip="{{schema}}|{{params.linkType.fields.applicationProfile.tooltip}}"
+                >applicationProfile</label
               >
               <div class="col-sm-9">
                 <input
@@ -454,7 +434,6 @@
                   data-ng-required="params.linkType.fields.applicationProfile.required"
                   name="applicationProfile"
                   class="form-control"
-
                   type="text"
                 />
               </div>
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/fileUploader.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/fileUploader.html
index 414fd5b90e..632e09735d 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/fileUploader.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/fileUploader.html
@@ -17,10 +17,10 @@
           data-ng-src="{{onlinesrcService.getApprovedUrl(f.lUrl || f.id)}}"
         />
 
-          <span class="flex-row" data-ng-if="!isOverview">
-          <div class="width-25" data-gn-link-icon="f" data-mode="gn-icon-inline"></div>
-          <div class="width-75" data-gn-link-label="f" />
-        </span>
+        <div data-ng-if="!isOverview">
+          <div data-gn-link-icon="f" data-mode="gn-icon-inline"></div>
+          <div data-gn-link-label="f"></div>
+        </div>
 
         <a
           href=""
diff --git a/web-ui/src/main/resources/catalog/components/edit/organisationentryselector/OrganisationEntrySelector.js b/web-ui/src/main/resources/catalog/components/edit/organisationentryselector/OrganisationEntrySelector.js
index d486d0394b..48b8d247d7 100644
--- a/web-ui/src/main/resources/catalog/components/edit/organisationentryselector/OrganisationEntrySelector.js
+++ b/web-ui/src/main/resources/catalog/components/edit/organisationentryselector/OrganisationEntrySelector.js
@@ -199,13 +199,13 @@
 
               gnHttp.callService("subtemplate", params).then(function (response) {
                 var xml = response.data;
+
                 if (usingXlink) {
                   snippets.push(
                     gnEditorXMLService.buildXMLForXlink(
                       scope.schema,
                       scope.elementName,
                       url + "?uuid=" + uuid + "&process=" + params.process
-
                     )
                   );
                 } else {
diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js b/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
index 3be5303f23..8944549af1 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/EsFacet.js
@@ -258,7 +258,9 @@
           return gnEsLanguageService.injectLanguage(field, languageConfig, false);
         }
         return undefined;
-      };this.addFacets = function (esParams, type, languageConfig) {
+      };
+
+      this.addFacets = function (esParams, type, languageConfig) {
         var esFacet = this,
           aggs =
             typeof type === "string" ? angular.copy(this.configs[type].facets, {}) : type;
@@ -318,9 +320,10 @@
         }
         var source = typeof type === "string" ? this.configs[type].source : type;
         esParams._source = source;
-if (this.configs[type].script_fields) {
+        if (this.configs[type].script_fields) {
           esParams.script_fields = this.configs[type].script_fields;
         }
+
         // By default limit to 10000.
         // Set to true will be a bit slower
         // See https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-body.html#request-body-search-track-total-hits
@@ -369,8 +372,9 @@ if (this.configs[type].script_fields) {
             meta: respAgg.meta,
             config: reqAgg,
             items: [],
-            path: (path || []).concat([respAgg.meta && respAgg.meta.field ? respAgg.meta.field : searchFieldId
-          ])
+            path: (path || []).concat([
+              respAgg.meta && respAgg.meta.field ? respAgg.meta.field : searchFieldId
+            ])
           };
 
           if (reqAgg.hasOwnProperty("terms")) {
diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/LuceneQueryParser.js b/web-ui/src/main/resources/catalog/components/elasticsearch/LuceneQueryParser.js
index ad00146f66..9c1d3c16c9 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/LuceneQueryParser.js
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/LuceneQueryParser.js
@@ -122,32 +122,6 @@
         }
         return query_string;
       }
-
-      function parseAstNode(node, facets) {
-              if (!node) return;
-
-              var left = node.left;
-              var right = node.right;
-              var field = node.field;
-              var operator = node.operator;
-              var term = node.term;
-              var nextGroup = facets;
-
-              if (field) {
-                var indexKey = field.field;
-                facets[indexKey] = facets[indexKey] || [];
-                nextGroup = facets[indexKey];
-              }
-
-              if (Array.isArray(facets)) {
-                if (term) {
-                  facets.push(term);
-                }
-              } else if (typeof facets == "object") {
-              }
-              parseAstNode(left, nextGroup);
-              parseAstNode(right, nextGroup);
-            }
     }
   ]);
 })();
diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/directives/FacetDirective.js b/web-ui/src/main/resources/catalog/components/elasticsearch/directives/FacetDirective.js
index b749fcbddf..f4e48934d3 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/directives/FacetDirective.js
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/directives/FacetDirective.js
@@ -183,7 +183,8 @@
 
   module.filter("facetTranslator", [
     "$translate",
-   "$filter", function ($translate, $filter) {
+    "$filter",
+    function ($translate, $filter) {
       return function (input, facetKey) {
         if (!input || angular.isObject(input)) {
           return input;
@@ -206,8 +207,9 @@
         if (facetKey === "statusWorkflow") {
           translation = $filter("getStatusLabel")(input);
         } else {
-          translation =$translate.instant(translationId);
-        }if (translation !== translationId) {
+          translation = $translate.instant(translationId);
+        }
+        if (translation !== translationId) {
           return translation;
         } else {
           // A common translations ?
@@ -864,7 +866,10 @@
               scope.vl.view.addEventListener("click", function (event, item) {
                 if (item.datum && item.datum.$$hashKey) {
                   $timeout(function () {
-                    scope.updateCallback({ facet: scope.facet, item: item.datum });
+                    scope.updateCallback({
+                      facet: scope.facet,
+                      item: item.datum
+                    });
                   }, 10);
                 }
               });
diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet-tab.html b/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet-tab.html
index c9ecbcd7cf..e4c64b3b82 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet-tab.html
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet-tab.html
@@ -11,7 +11,6 @@
       data-key="ctrl.item.value"
     />
     {{::ctrl.item.count}} {{::ctrl.item.value | facetTranslator: (ctrl.facet.meta &&
-    ctrl.facet.meta.field) ||ctrl.facet.key |
-    capitalize}}
+    ctrl.facet.meta.field) || ctrl.facet.key | capitalize}}
   </a>
 </li>
diff --git a/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet.html b/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet.html
index 5437ad91b0..f9e101a394 100644
--- a/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet.html
+++ b/web-ui/src/main/resources/catalog/components/elasticsearch/directives/partials/facet.html
@@ -44,13 +44,13 @@
     <a
       href
       class="facet-invert"
-      title="{{::(ctrl.item.inverted ? 'filterWithValue' : 'allValuesExcept') | translate}}"
+      title="{{(ctrl.item.inverted ? 'filterWithValue' : 'allValuesExcept') | translate}}"
       ng-click="ctrl.toggleInvert()"
     >
       <span class="fa" ng-class="ctrl.item.inverted ? 'fa-check' : 'fa-minus-circle'">
       </span>
       <span>
-        {{::(ctrl.item.inverted ? 'filterWithValue' : 'allValuesExcept') | translate}}
+        {{(ctrl.item.inverted ? 'filterWithValue' : 'allValuesExcept') | translate}}
       </span>
     </a>
   </div>
diff --git a/web-ui/src/main/resources/catalog/components/index/partials/datafilterview.html b/web-ui/src/main/resources/catalog/components/index/partials/datafilterview.html
index a0784048b9..62a4ed3470 100644
--- a/web-ui/src/main/resources/catalog/components/index/partials/datafilterview.html
+++ b/web-ui/src/main/resources/catalog/components/index/partials/datafilterview.html
@@ -15,7 +15,10 @@
       <div
         data-gn-wfs-download=""
         data-typename="{{layer.getSource().getParams().LAYERS}}"
-        data-url="{{layer.get('url')}}" class="clearfix" data-map="map"></div>
+        data-url="{{layer.get('url')}}"
+        class="clearfix"
+        data-map="map"
+      ></div>
 
       <div
         data-gn-wfs-filter-facets=""
diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionsDirective.js b/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionsDirective.js
index 31366e35e9..6bad0fd1d7 100644
--- a/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionsDirective.js
+++ b/web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionsDirective.js
@@ -74,88 +74,11 @@
                     {
                       title: translations.metadataApproved,
                       content:
-                       '<div gn-batch-report="processReport" template-url="' +
-                        reportTemplate +
-                        '"></div>',
-                      className: "gn-status-popup",
-                      onCloseCallback: function () {
-                        scope.$emit("metadataStatusUpdated", true);
-                        scope.$emit("StatusUpdated", true);
-                        scope.$broadcast("operationOnSelectionStop");
-                        scope.processReport = null;
-                      }
-                    },
-                    scope,
-                    "StatusUpdated"
-                  );
-                },
-                function (response) {
-                  scope.$broadcast("operationOnSelectionStop");
-                  scope.$emit("metadataStatusUpdated", false);
-
-                  scope.$emit("StatusUpdated", {
-                    title: $translate.instant("metadataStatusUpdatedErrors"),
-                    error: response.data,
-                    timeout: 0,
-                    type: "danger"
-                  });
-                }
-              );
-          };
-        }
-      };
-    }
-  ]);
-
-  module.directive("gnMetadataBatchSubmit", [
-    "$translate",
-    "$http",
-    "gnMetadataManager",
-    "gnUtilityService",
-    function ($translate, $http, gnMetadataManager, gnUtilityService) {
-      return {
-        restrict: "A",
-        replace: true,
-        templateUrl:
-          "../../catalog/components/metadataactions/partials/" + "batchsubmit.html",
-        scope: {
-          selectionBucket: "@"
-        },
-        link: function (scope) {
-          var translations = null;
-          $translate(["metadataSubmitted"]).then(function (t) {
-            translations = t;
-          });
-
-          scope.changeMessage = "";
-
-          scope.submit = function () {
-            scope.$broadcast("operationOnSelectionStart");
-
-            return $http
-              .put("../api/records/submit", {
-                bucket: scope.selectionBucket,
-                message: scope.changeMessage
-              })
-              .then(
-                function (response) {
-                  scope.processReport = response.data;
-                  var reportTemplate =
-                    "../../catalog/components/utility/" +
-                    "partials/batchreport-workflow.html";
-
-                  scope.$broadcast("operationOnSelectionStop");
-
-                  // A report is returned
-                  gnUtilityService.openModal(
-                    {
-                      title: translations.metadataSubmitted,
-                      content: '<div gn-batch-report="processReport" template-url="' +
+                        '<div gn-batch-report="processReport" template-url="' +
                         reportTemplate +
                         '"></div>',
                       className: "gn-status-popup",
                       onCloseCallback: function () {
-                        scope.$emit("metadataStatusUpdated", true);
                         scope.$emit("metadataStatusUpdated", true);
                         scope.$emit("StatusUpdated", true);
                         scope.$broadcast("operationOnSelectionStop");
diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDropdown.html b/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDropdown.html
index d7c9da803a..ce2d0c1b2b 100644
--- a/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDropdown.html
+++ b/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDropdown.html
@@ -12,7 +12,7 @@
     <span
       data-ng-repeat-start="(type, items) in md.related track by $index"
       data-ng-init="mainType = config.getType(md, type);
-                icon = config.getClassIcon(mainType);"
+                    icon = config.getClassIcon(mainType);"
     >
     </span>
     <li data-ng-if="items.length > 0" class="gn-related-title">
diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedEditorList.html b/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedEditorList.html
index ae1a43abd9..bbc304165a 100644
--- a/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedEditorList.html
+++ b/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedEditorList.html
@@ -13,7 +13,6 @@
           title="{{record.resourceTitle}}"
           gn-metadata-open="record"
           data-app-url="catalog.search"
-
         >
           <i
             class="fa fa-fw {{icon}} gn-icon-association-{{record.properties.associationType}} gn-icon-initiative-{{record.properties.initiativeType}}"
@@ -25,7 +24,7 @@
           data-ng-href="{{record.remoteUrl}}"
           rel="noopener noreferrer"
           target="_blank"
-          title="{{record.resourceTitle|| record.uuid}}"
+          title="{{record.resourceTitle || record.uuid}}"
         >
           <i class="fa {{icon}}" />
           {{record.resourceTitle || record.uuid}}
diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
index 53699e7ebc..90fb03c38c 100644
--- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
+++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
@@ -276,15 +276,16 @@
                   setStatus({ msg: "saveMetadataError", saving: false });
                 }
 
-              gnCurrentEdit.working = false;
+                gnCurrentEdit.working = false;
 
-              // Error is returned in XML format, convert it to JSON
-              var x2js = new X2JS();
-              var errorJson = x2js.xml_str2json(error);
+                // Error is returned in XML format, convert it to JSON
+                var x2js = new X2JS();
+                var errorJson = x2js.xml_str2json(error);
 
-              defer.reject(errorJson.apiError);
-            }
-          );return defer.promise;
+                defer.reject(errorJson.apiError);
+              }
+            );
+          return defer.promise;
         },
         /**
          * Cancel the changes
@@ -473,26 +474,26 @@
                 "&name=" +
                 name +
                 attributeAction
-
             )
-            .then(function (response) {
-              // Append HTML snippet after current element - compile Angular
-              var target = $("#gn-el-" + insertRef);
-              var snippet = $(cleanData(response.data));
-
-              if (attribute) {
-                target.replaceWith(snippet);
-              } else {
-                // If the element was a add button
-                // without any existing element, the
-                // gn-extra-field indicating a not first field
-                // was not set. After add, set the css class.
-                if (target.hasClass("gn-add-field")) {
-                  target.addClass("gn-extra-field");
-                }
-                snippet.css("display", "none"); // Hide
-                target[position || "after"](snippet); // Insert
-                snippet.slideDown(duration, function () {}); // Slide
+            .then(
+              function (response) {
+                // Append HTML snippet after current element - compile Angular
+                var target = $("#gn-el-" + insertRef);
+                var snippet = $(cleanData(response.data));
+
+                if (attribute) {
+                  target.replaceWith(snippet);
+                } else {
+                  // If the element was a add button
+                  // without any existing element, the
+                  // gn-extra-field indicating a not first field
+                  // was not set. After add, set the css class.
+                  if (target.hasClass("gn-add-field")) {
+                    target.addClass("gn-extra-field");
+                  }
+                  snippet.css("display", "none"); // Hide
+                  target[position || "after"](snippet); // Insert
+                  snippet.slideDown(duration, function () {}); // Slide
 
                   // Adapt the add & move element
                   checkAddControls(snippet);
@@ -522,25 +523,27 @@
                 "&child=" +
                 name
             )
-            .then(function (response) {
-              // Append HTML snippet after current element - compile Angular
-              var target = $("#gn-el-" + insertRef);
-              var snippet = $(cleanData(response.data));
+            .then(
+              function (response) {
+                // Append HTML snippet after current element - compile Angular
+                var target = $("#gn-el-" + insertRef);
+                var snippet = $(cleanData(response.data));
 
-              if (target.hasClass("gn-add-field")) {
-                target.addClass("gn-extra-field");
-              }
-              snippet.css("display", "none"); // Hide
-              target[position || "before"](snippet); // Insert
-              snippet.slideDown(duration, function () {}); // Slide
+                if (target.hasClass("gn-add-field")) {
+                  target.addClass("gn-extra-field");
+                }
+                snippet.css("display", "none"); // Hide
+                target[position || "before"](snippet); // Insert
+                snippet.slideDown(duration, function () {}); // Slide
 
-              checkAddControls(snippet);
-              checkMoveControls(snippet);
+                checkAddControls(snippet);
+                checkMoveControls(snippet);
 
-              $compile(snippet)(gnCurrentEdit.formScope);
-              defer.resolve(snippet);
-            },function (response) {
-              defer.reject(response.data);
+                $compile(snippet)(gnCurrentEdit.formScope);
+                defer.resolve(snippet);
+              },
+              function (response) {
+                defer.reject(response.data);
               }
             );
           return defer.promise;
@@ -559,57 +562,57 @@
                 gnCurrentEdit.displayAttributes +
                 "&parent=" +
                 parent
-
             )
-            .then(function (response) {
-              // For a fieldset, domref is equal to ref.
-              // For an input, it may be different because
-              // the element to remove is the parent of the input
-              // element (eg. gmd:voice for a gco:CharacterString)
-              domRef = domRef || ref;
-              // The element to remove from the DOM
-              var target = $("#gn-el-" + domRef);
-
-              // When adding a new element, the down control
-              // of the previous element must be enabled and
-              // the up control enabled only if the previous
-              // element is not on top.
-              var checkMoveControls = function (element) {
-                // If first element with down only
-                //  apply this to the next one
-                var isFirst = isFirstElementOfItsKind(element);
-                if (isFirst) {
-                  var next = $(element).next().get(0);
-                  var elementCtrl = $(next).find("div.gn-move").get(0);
-                  var ctrl = $(elementCtrl).children();
-                  $(ctrl.get(0)).addClass("invisible");
-
-                  if ($(next).hasClass("gn-extra-field")) {
-                    $(next).removeClass("gn-extra-field");
-                  }
-                } else {
-                  // If middle element with up and down
-                  // do nothing
-
-                  // If last element with up only
-                  //  apply this to previous
-                  var isLast = isLastElementOfItsKind(element);
-                  if (isLast) {
-                    var prev = $(element).prev().get(0);
-                    var elementCtrl = $(prev).find("div.gn-move").get(0);
+            .then(
+              function (response) {
+                // For a fieldset, domref is equal to ref.
+                // For an input, it may be different because
+                // the element to remove is the parent of the input
+                // element (eg. gmd:voice for a gco:CharacterString)
+                domRef = domRef || ref;
+                // The element to remove from the DOM
+                var target = $("#gn-el-" + domRef);
+
+                // When adding a new element, the down control
+                // of the previous element must be enabled and
+                // the up control enabled only if the previous
+                // element is not on top.
+                var checkMoveControls = function (element) {
+                  // If first element with down only
+                  //  apply this to the next one
+                  var isFirst = isFirstElementOfItsKind(element);
+                  if (isFirst) {
+                    var next = $(element).next().get(0);
+                    var elementCtrl = $(next).find("div.gn-move").get(0);
                     var ctrl = $(elementCtrl).children();
-                    $(ctrl.get(1)).addClass("invisible");
+                    $(ctrl.get(0)).addClass("invisible");
 
-                    var next = $(element).next();
-                    if (next.hasClass("gn-add-field")) {
-                      next.removeClass("gn-extra-field");
+                    if ($(next).hasClass("gn-extra-field")) {
+                      $(next).removeClass("gn-extra-field");
+                    }
+                  } else {
+                    // If middle element with up and down
+                    // do nothing
+
+                    // If last element with up only
+                    //  apply this to previous
+                    var isLast = isLastElementOfItsKind(element);
+                    if (isLast) {
+                      var prev = $(element).prev().get(0);
+                      var elementCtrl = $(prev).find("div.gn-move").get(0);
+                      var ctrl = $(elementCtrl).children();
+                      $(ctrl.get(1)).addClass("invisible");
+
+                      var next = $(element).next();
+                      if (next.hasClass("gn-add-field")) {
+                        next.removeClass("gn-extra-field");
+                      }
                     }
                   }
-                }
-              };
+                };
 
-              checkAddControls(target.get(0), true);
-              checkMoveControls(target.get(0));
+                checkAddControls(target.get(0), true);
+                checkMoveControls(target.get(0));
 
                 target.slideUp(duration);
                 target.promise().done(function () {
diff --git a/web-ui/src/main/resources/catalog/components/pages/partials/top.html b/web-ui/src/main/resources/catalog/components/pages/partials/top.html
index 3530d90a4f..a23b2a2ef4 100644
--- a/web-ui/src/main/resources/catalog/components/pages/partials/top.html
+++ b/web-ui/src/main/resources/catalog/components/pages/partials/top.html
@@ -1,5 +1,3 @@
-<li data-ng-repeat-start="menu in pagesConfig"></li
-  >
-    <li gn-static-page-menu="menu" language="{{language}}" section="{{section}}"></li>
-<li
-    data-ng-repeat-end=""></li>
+<li data-ng-repeat-start="menu in pagesConfig"></li>
+<li gn-static-page-menu="menu" language="{{language}}" section="{{section}}"></li>
+<li data-ng-repeat-end=""></li>
diff --git a/web-ui/src/main/resources/catalog/components/search/searchfiltertag/SearchFilterTagsDirective.js b/web-ui/src/main/resources/catalog/components/search/searchfiltertag/SearchFilterTagsDirective.js
index d459361ae2..7f4fcbd8d3 100644
--- a/web-ui/src/main/resources/catalog/components/search/searchfiltertag/SearchFilterTagsDirective.js
+++ b/web-ui/src/main/resources/catalog/components/search/searchfiltertag/SearchFilterTagsDirective.js
@@ -40,7 +40,6 @@
                 .title
           : rangeValue;
       };
-      };
     }
   ]);
 
diff --git a/web-ui/src/main/resources/catalog/components/search/searchfiltertag/partials/searchFilterTagsTemplate.html b/web-ui/src/main/resources/catalog/components/search/searchfiltertag/partials/searchFilterTagsTemplate.html
index af98f4b340..cbb48b7df8 100644
--- a/web-ui/src/main/resources/catalog/components/search/searchfiltertag/partials/searchFilterTagsTemplate.html
+++ b/web-ui/src/main/resources/catalog/components/search/searchfiltertag/partials/searchFilterTagsTemplate.html
@@ -37,16 +37,17 @@
       </span>
       <span
         ng-if="::!specific && filter.label === undefined && type === undefined"
-        ng-repeat="(key, value) in filter.value track by $index"ng-init="type = getFilterType({value: value})"
+        ng-repeat="(key, value) in filter.value track by $index"
+        ng-init="type = getFilterType({value: value})"
         ng-class="{'gn-filter-negative': isNegative(value)}"
-        >
+      >
         <span ng-if="::type === 'RANGE'">
           {{::value | renderRangeExpression:filter.key}}
         </span>
         <span ng-if="::type !== 'RANGE'">
           {{::key | facetTranslator: filter.key | capitalize}}
-        </span></span
-      >
+        </span>
+      </span>
       <!-- TODO: Nested aggs support -->
       <div class="flex-grow"></div>
       <span class="fa fa-times text-danger delete-icon pull-right"></span>
diff --git a/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js b/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js
index 06389b2260..f69b79f083 100644
--- a/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js
+++ b/web-ui/src/main/resources/catalog/components/utility/UtilityDirective.js
@@ -132,7 +132,9 @@
             hits &&
               hits.map &&
               hits.map(function (h) {
-                var overview = h.overview || (h._source && h._source.overview)||
+                var overview =
+                  h.overview ||
+                  (h._source && h._source.overview) ||
                   (h.fields && h.fields.overview);
                 if (overview) {
                   scope.images = scope.images.concat(overview);
@@ -993,7 +995,8 @@
                   function () {
                     deferred.resolve();
                   },
-                  function () {
+                  function (r) {
+                    console.warn(r);
                     deferred.reject();
                   }
                 );
@@ -1332,37 +1335,6 @@
     }
   ]);
 
-  module.directive("gnLinkIcon", [
-    "gnRelatedResources",
-    function (gnRelatedResources) {
-      return {
-        restrict: "A",
-        templateUrl: "../../catalog/components/utility/" + "partials/linkicon.html",
-        scope: {
-          link: "=gnLinkIcon",
-          mode: "@"
-        },
-        link: function (scope, element, attrs) {
-          scope.mainType = gnRelatedResources.getType(scope.link, null);
-          scope.badge = gnRelatedResources.getBadgeLabel(scope.mainType, scope.link);
-
-          scope.mimeTypeIconClass = scope.link.mimeType
-            ? "gn-icon-" + scope.link.mimeType
-            : "";
-          scope.protocolIconClass = scope.link.protocol
-            ? "gn-icon-" +
-              scope.link.protocol.replace(":", "-").replace(" ", "-").toLowerCase()
-            : "";
-          scope.typeIconClass = gnRelatedResources.getClassIcon(scope.mainType);
-
-          scope.typeClass =
-            "gn-icontype-" +
-            scope.mainType.replace(":", "-").replace(" ", "-").toLowerCase();
-        }
-      };
-    }
-  ]);
-
   module.directive("gnCircleLetterIcon", [
     "$http",
     function ($http) {
@@ -2400,7 +2372,7 @@
                   '  <button type=button class="btn btn-danger gn-btn-modal-img">' +
                   '<i class="fa fa-times"/></button>' +
                   '  <img src="' +
-                  (attr.ngSrc ||img.lUrl || img.url || img.id) +
+                  (attr.ngSrc || img.lUrl || img.url || img.id) +
                   '"/>' +
                   (label != "" ? labelDiv : "") +
                   "</div>" +
diff --git a/web-ui/src/main/resources/catalog/components/utility/partials/linklabel.html b/web-ui/src/main/resources/catalog/components/utility/partials/linklabel.html
index 839f43625e..2901bfd1fb 100644
--- a/web-ui/src/main/resources/catalog/components/utility/partials/linklabel.html
+++ b/web-ui/src/main/resources/catalog/components/utility/partials/linklabel.html
@@ -4,6 +4,6 @@
   data-ng-if="link.lUrl.match('^http|ftp') !== null"
   target="_blank"
 >
-  {{link.lUrl.split('/').pop()}}
+  {{link.lUrl}}
 </a>
 <span data-ng-if="link.lUrl.match('^http|ftp') === null"> {{link.lUrl}} </span>
diff --git a/web-ui/src/main/resources/catalog/components/viewer/gfi/partials/featurestables.html b/web-ui/src/main/resources/catalog/components/viewer/gfi/partials/featurestables.html
index 8c6c84a5e4..57285eed5a 100644
--- a/web-ui/src/main/resources/catalog/components/viewer/gfi/partials/featurestables.html
+++ b/web-ui/src/main/resources/catalog/components/viewer/gfi/partials/featurestables.html
@@ -9,7 +9,8 @@
 
   <ul class="nav nav-tabs" data-ng-show="ctrl.tables.length > 1">
     <li
-      data-ng-repeat="table in ctrl.tables"data-ng-show="table.loader.getCount() > 0"
+      data-ng-repeat="table in ctrl.tables"
+      data-ng-show="table.loader.getCount() > 0"
       data-ng-class="{active: table == ctrl.currentTable}"
     >
       <a role="tab" data-ng-click="ctrl.currentTable = table" title="{{::table.name}}">
diff --git a/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js b/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js
index 3648580f02..2e40e5cec0 100644
--- a/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js
+++ b/web-ui/src/main/resources/catalog/components/viewer/owscontext/OwsContextService.js
@@ -94,7 +94,8 @@
       // eg. name="{type=arcgis,name=0,1,2,3,4}"
       var reT = /type=([^,}|^]*)/;
       var reL = /name=([^}]*)\}?\s*$/;
-var dimensions = ["TIME", "ELEVATION"];
+      var dimensions = ["TIME", "ELEVATION"];
+
       /**
        * @ngdoc method
        * @name gnOwsContextService#loadContext
@@ -230,7 +231,8 @@ var dimensions = ["TIME", "ELEVATION"];
           for (i = 0; i < layers.length; i++) {
             var type,
               layer = layers[i];
-            if (layer.group == "Background layers") {var layerAttributionArray;
+            if (layer.group == "Background layers") {
+              var layerAttributionArray;
               if (layer.vendorExtension && layer.vendorExtension.attribution) {
                 layerAttributionArray = [];
                 for (var a = 0; a < layer.vendorExtension.attribution.length; a++) {
@@ -278,6 +280,7 @@ var dimensions = ["TIME", "ELEVATION"];
                   }
                 }
               };
+
               // {type=bing_aerial} (mapquest, osm ...)
               // {type=arcgis,name=0,1,2}
               // type=wms,name=lll
@@ -704,7 +707,7 @@ var dimensions = ["TIME", "ELEVATION"];
           }
           if (processInputs) {
             extension.processInputs = processInputs;
-         }
+          }
           if (layer.showInfo) {
             extension.enabled = true; // Enabled in layer manager
           }
@@ -786,7 +789,7 @@ var dimensions = ["TIME", "ELEVATION"];
        * @param {numeric} index of the layer in the tree
        */
       this.createLayer = function (layer, map, bgIdx, index, style) {
-var res = { href: "" };
+        var res = { href: "" };
         if (layer.server) {
           var server = layer.server[0];
           res = server.onlineResource[0];
diff --git a/web-ui/src/main/resources/catalog/components/viewer/wfs/partials/download.html b/web-ui/src/main/resources/catalog/components/viewer/wfs/partials/download.html
index d80e42ea20..57a773944d 100644
--- a/web-ui/src/main/resources/catalog/components/viewer/wfs/partials/download.html
+++ b/web-ui/src/main/resources/catalog/components/viewer/wfs/partials/download.html
@@ -44,34 +44,41 @@
     <div data-ng-if="mode == 'dropdown'">
       <div data-ng-repeat="type in featureTypes">
         <button
-        type="button"
-        class="btn btn-default btn-sm dropdown-toggle"
-        data-toggle="dropdown"
-        aria-haspopup="true"
-        aria-expanded="false"
-
+          type="button"
+          class="btn btn-default btn-sm dropdown-toggle"
+          data-toggle="dropdown"
+          aria-haspopup="true"
+          aria-expanded="false"
         >
           <i class="fa fa-fw fa-download"></i>
           <span data-translate="">downloadFeature</span>
           <span>{{type.label}}</span>
           <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu">
-        <li class="dropdown-header" data-translate="">downloadAllIn</li>
-        <li data-ng-repeat="f in formats | orderBy:f track by $index">
-          <a data-gn-click-and-spin="downloadFeatureType(type.type, type.label, f)"
-              title="{{f}}"> {{f | lowercase| translate}} </a>
-        </li>
-        <li data-ng-if="map" role="separator" class="divider"></li>
-        <li class="dropdown-header" data-ng-if="map" data-translate="">
-          downloadInCurrentMapExtent
-        </li>
-        <li data-ng-if="map" data-ng-repeat="f in formats | orderBy:f track by $index">
-          <a data-gn-click-and-spin="downloadFeatureType(type.type, type.label, f, true)"
+        </button>
+        <ul class="dropdown-menu">
+          <li class="dropdown-header" data-translate="">downloadAllIn</li>
+          <li data-ng-repeat="f in formats | orderBy:f track by $index">
+            <a
+              data-gn-click-and-spin="downloadFeatureType(type.type, type.label, f)"
+              title="{{f}}"
+            >
+              {{f | lowercase | translate}}
+            </a>
+          </li>
+          <li data-ng-if="map" role="separator" class="divider"></li>
+          <li class="dropdown-header" data-ng-if="map" data-translate="">
+            downloadInCurrentMapExtent
+          </li>
+          <li data-ng-if="map" data-ng-repeat="f in formats | orderBy:f track by $index">
+            <a
+              data-gn-click-and-spin="downloadFeatureType(type.type, type.label, f, true)"
               title="{{f}}"
-            > {{f | lowercase | translate}} </a>
-        </li>
-      </ul></div>
+            >
+              {{f | lowercase | translate}}
+            </a>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
   <div
@@ -124,8 +131,8 @@
             <li data-ng-if="map" data-ng-repeat="format in formats | orderBy:f">
               <a
                 data-gn-click-and-spin="downloadFeatureType(ftSelected,
-                 ftSelected.name.prefix + ':' + ftSelected.name.localPart, true)"
-
+                 ftSelected.name.prefix + ':' + ftSelected.name.localPart,
+                  true)"
               >
                 {{format | lowercase | translate}}
               </a>
diff --git a/web-ui/src/main/resources/catalog/js/LoginController.js b/web-ui/src/main/resources/catalog/js/LoginController.js
index dd20ddfaff..e8b2ccdf7c 100644
--- a/web-ui/src/main/resources/catalog/js/LoginController.js
+++ b/web-ui/src/main/resources/catalog/js/LoginController.js
@@ -87,8 +87,8 @@
       // take the bigger of the two values$scope.passwordMinLength = Math.max(
         gnConfig["system.security.passwordEnforcement.minLength"],
         6
-      );
-      $scope.passwordMaxLength = Math.max(
+
+      );$scope.passwordMaxLength = Math.max(
         gnConfig["system.security.passwordEnforcement.maxLength"],
         6
 
diff --git a/web-ui/src/main/resources/catalog/js/admin/DashboardRecordLinkController.js b/web-ui/src/main/resources/catalog/js/admin/DashboardRecordLinkController.js
index 70e35c5991..8cc6ec7fd3 100644
--- a/web-ui/src/main/resources/catalog/js/admin/DashboardRecordLinkController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/DashboardRecordLinkController.js
@@ -147,7 +147,6 @@
           sidePagination: "server",
           queryParamsType: "page,size",
           contentType: "application/x-www-form-urlencoded",
-          method: "get",
           pagination: true,
           paginationLoop: true,
           paginationHAlign: "right",
diff --git a/web-ui/src/main/resources/catalog/js/admin/HarvestSettingsController.js b/web-ui/src/main/resources/catalog/js/admin/HarvestSettingsController.js
index e9adb6b07b..b7544f92ef 100644
--- a/web-ui/src/main/resources/catalog/js/admin/HarvestSettingsController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/HarvestSettingsController.js
@@ -240,14 +240,14 @@
         $http
           .get("admin.harvester.info?_content_type=json&type=harvesterTypes", {
             cache: true
-
           })
-          .then(function (response) {
-            angular.forEach(response.data[0], function (value) {
-              $scope.harvesterTypes[value] = {
-                type: value,
-                label: "harvester-" + value
-              };
+          .then(
+            function (response) {
+              angular.forEach(response.data[0], function (value) {
+                $scope.harvesterTypes[value] = {
+                  type: value,
+                  label: "harvester-" + value
+                };
 
                 $.getScript("../../catalog/templates/admin/harvest/type/" + value + ".js")
                   .done(function (script, textStatus) {
@@ -409,18 +409,21 @@
             function (response) {
               deferred.reject(response.data);
               $rootScope.$broadcast("StatusUpdated", {
-              msg: $translate.instant("harvesterUpdated"),
-              error: response.data,
-              timeout: 2,
-              type: "danger"
-            });
-          });
+                msg: $translate.instant("harvesterUpdated"),
+                error: response.data,
+                timeout: 2,
+                type: "danger"
+              });
+            }
+          );
 
         return deferred.promise;
       };
 
-      $scope.selectHarvester = function (h) {$scope.activeTab.settings = true;
+      $scope.selectHarvester = function (h) {
+        $scope.activeTab.settings = true;
         $scope.setSimpleUrlPagination();
+
         // TODO: Specific to thredds
         if (h["@type"] === "thredds") {
           $scope.threddsCollectionsMode =
@@ -468,25 +471,26 @@
       };
 
       $scope.deleteHarvester = function () {
-              $scope.deleting.push($scope.harvesterSelected["@id"]);
-              return $http
-                .get(
-                  "admin.harvester.remove?_content_type=json&id=" +
-                    $scope.harvesterSelected["@id"]
-                )
-                .success(function (data) {
-                  $scope.harvesterSelected = {};
-                  $scope.harvesterUpdated = false;
-                  $scope.harvesterNew = false;
-                  $scope.$parent.loadHarvesters();
-                })
-                .error(function (data) {
-                  console.log(data);
-                })
-                .then(function () {
-                  $scope.deleting.splice($scope.deleting.indexOf(3), 1);
-                });
-            };
+        $scope.deleting.push($scope.harvesterSelected["@id"]);
+        return $http
+          .get(
+            "admin.harvester.remove?_content_type=json&id=" +
+              $scope.harvesterSelected["@id"]
+          )
+          .then(
+            function (response) {
+              $scope.harvesterSelected = {};
+              $scope.harvesterUpdated = false;
+              $scope.harvesterNew = false;
+              $scope.$parent.loadHarvesters();
+
+              $scope.deleting.splice($scope.deleting.indexOf(3), 1);
+            },
+            function (response) {
+              console.log(response.data);
+            }
+          );
+      };
 
       $scope.deleteHarvesterRecord = function () {
         return $http
@@ -530,7 +534,6 @@
         return $http
           .get(
             "admin.harvester.history.delete?uuid=" + $scope.harvesterSelected.site.uuid
-
           )
           .then(function (response) {
             $scope.$parent.loadHarvesters().then(function () {
@@ -542,7 +545,6 @@
         return $http
           .get(
             "admin.harvester.run?_content_type=json&id=" + $scope.harvesterSelected["@id"]
-
           )
           .then(function (response) {
             $scope.$parent.loadHarvesters().then(function () {
@@ -559,7 +561,6 @@
           .get("admin.harvester.stop?_content_type=json&id=" + id + "&status=" + status)
           .then(function () {
             $scope.$parent.loadHarvesters().then(refreshSelectedHarvester);
-
             $scope.stopping = false;
           });
       };
@@ -709,24 +710,26 @@
           .get($scope.proxyUrl + encodeURIComponent(url + "/srv/eng/info?type=sources"))
           .then(
             function (response) {
-            $scope.geonetworkSources = [];
-            var i = 0;
-            var xmlDoc = $.parseXML(response.data);
-            var $xml = $(xmlDoc);
-            $sources = $xml.find("uuid");
-            $names = $xml.find("name");
-
-            angular.forEach($sources, function (s) {
-              // FIXME: probably some issue on IE ?
-              $scope.geonetworkSources.push({
-                uuid: s.textContent,
-                name: $names[i].textContent
+              $scope.geonetworkSources = [];
+              var i = 0;
+              var xmlDoc = $.parseXML(response.data);
+              var $xml = $(xmlDoc);
+              $sources = $xml.find("uuid");
+              $names = $xml.find("name");
+
+              angular.forEach($sources, function (s) {
+                // FIXME: probably some issue on IE ?
+                $scope.geonetworkSources.push({
+                  uuid: s.textContent,
+                  name: $names[i].textContent
+                });
+                i++;
               });
-              i++;
-            });
-          },function (response) {
-            // TODO
-          });
+            },
+            function (response) {
+              // TODO
+            }
+          );
       };
 
       // OGCWxS
@@ -929,8 +932,7 @@
               "SERVICE=CSW&REQUEST=GetCapabilities&VERSION=2.0.2";
           }
 
-          $http
-            .get($scope.proxyUrl + encodeURIComponent(url)).then(
+          $http.get($scope.proxyUrl + encodeURIComponent(url)).then(
             function (response) {
               $scope.cswCriteria = [];
 
diff --git a/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js b/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js
index 2e3f668f25..f13073cf0d 100644
--- a/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/LogoSettingsController.js
@@ -100,7 +100,8 @@
               type: "danger"
             });
             loadLogo();
-          });
+          }
+        );
       };
 
       /**
diff --git a/web-ui/src/main/resources/catalog/js/admin/MapServerController.js b/web-ui/src/main/resources/catalog/js/admin/MapServerController.js
index 36f3e958b0..3aaa87f5a1 100644
--- a/web-ui/src/main/resources/catalog/js/admin/MapServerController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/MapServerController.js
@@ -123,23 +123,23 @@
           .post("../api/mapservers/" + $scope.mapserverSelected.id + "/auth", data, {
             headers: { "Content-Type": "application/x-www-form-urlencoded" }
           })
-          .then(function (response) {
+          .then(
+            function (response) {
               $scope.resetPassword = null;
               $("#passwordResetModal").modal("hide");
-            },function (response) {
+            },
+            function (response) {
               // TODO
             }
           );
       };
-      };
 
       $scope.deleteMapserverConfig = function () {
         $("#gn-confirm-remove-mapserver").modal("show");
       };
 
       $scope.confirmDeleteMapserverConfig = function () {
-        $http
-          .delete("../api/mapservers/" + $scope.mapserverSelected.id).then(
+        $http.delete("../api/mapservers/" + $scope.mapserverSelected.id).then(
           function (response) {
             loadMapservers();
           },
diff --git a/web-ui/src/main/resources/catalog/js/admin/SystemSettingsController.js b/web-ui/src/main/resources/catalog/js/admin/SystemSettingsController.js
index eed870fa9a..2d81d091a7 100644
--- a/web-ui/src/main/resources/catalog/js/admin/SystemSettingsController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/SystemSettingsController.js
@@ -198,7 +198,6 @@
 
         $http.get("../api/site/info/notificationLevels").then(function (response) {
           $scope.notificationLevels = response.data;
-          $scope.notificationLevels .unshift("");
           $scope.notificationLevels.unshift("");
         });
 
@@ -207,10 +206,10 @@
           $scope.logfiles = response.data;
         });
 
-        $http
-          .get("../api/site/settings/details").then(
+        $http.get("../api/site/settings/details").then(
           function (response) {
             var data = response.data;
+
             var sectionsLevel1 = [];
             var sectionsLevel2 = [];
 
@@ -272,9 +271,11 @@
                 }, 900);
               }
             }
-          },function (response) {
+          },
+          function (response) {
             // TODO
-          });
+          }
+        );
         loadUiConfigurations();
       }
 
@@ -286,6 +287,7 @@
         $scope.uiConfigurationIdIsValid = false;
         return $http.get("../api/ui").then(function (response) {
           var data = response.data;
+
           for (var i = 0; i < data.length; i++) {
             data[i].configuration == angular.toJson(data[i].configuration);
 
@@ -440,18 +442,18 @@
           })
           .then(
             function (response) {
-            $(".gn-no-setting").attr("disabled", false);
+              $(".gn-no-setting").attr("disabled", false);
 
-            $rootScope.$broadcast("StatusUpdated", {
-              msg: $translate.instant("settingsUpdated"),
-              timeout: 2,
-              type: "success"
-            });
+              $rootScope.$broadcast("StatusUpdated", {
+                msg: $translate.instant("settingsUpdated"),
+                timeout: 2,
+                type: "success"
+              });
 
-            $scope.loadCatalogInfo();
-          },
-          function (response) {
-            $(".gn-no-setting").attr("disabled", false);
+              $scope.loadCatalogInfo();
+            },
+            function (response) {
+              $(".gn-no-setting").attr("disabled", false);
 
               $rootScope.$broadcast("StatusUpdated", {
                 title: $translate.instant("settingsUpdateError"),
diff --git a/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js b/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js
index bcc304db51..2d80718db6 100644
--- a/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/UserGroupController.js
@@ -186,11 +186,9 @@
 
       function loadUsers() {
         $scope.isLoadingUsers = true;
-        $http
-          .get("../api/users")
-          .then(function (response) {
+        $http.get("../api/users").then(
+          function (response) {
             $scope.users = response.data;
-
             $scope.isLoadingUsers = false;
 
             // Search if requested user in location is
@@ -292,30 +290,30 @@
         $scope.userSelected = null;
         $scope.userGroups = null;
 
-        $http
-          .get("../api/users/" + u.id).then(
+        $http.get("../api/users/" + u.id).then(
           function (response) {
             var data = response.data;
+
             $scope.userSelected = data;
             $scope.userIsAdmin = data.profile === "Administrator";
 
             $scope.userIsEnabled = data.enabled;
 
             // Load user group and then select user
-            $http
-              .get("../api/users/" + u.id + "/groups").then(
+            $http.get("../api/users/" + u.id + "/groups").then(
               function (response) {
                 $scope.userGroups = response.data;
               },
               function (response) {
                 // TODO
               }
-          )
-          ;
-          },function (response) {
+            );
+          },
+          function (response) {
             // TODO
           }
-);
+        );
+
         // Retrieve records in that group
         $scope.$broadcast("resetSearch", {
           isTemplate: ["y", "n", "s", "t"],
@@ -618,8 +616,7 @@
        * Remove the user and refresh the list when done.
        */
       $scope.confirmRemoveUser = function () {
-        $http
-          .delete("../api/users/" + $scope.userSelected.id).then(
+        $http.delete("../api/users/" + $scope.userSelected.id).then(
           function (response) {
             $rootScope.$broadcast("StatusUpdated", {
               msg: $translate.instant("userRemoved"),
@@ -715,7 +712,6 @@
             "../api/groups" +
               ($scope.groupSelected.id != -99 ? "/" + $scope.groupSelected.id : ""),
             $scope.groupSelected
-
           )
           .then(createOrModifyGroupSuccess, createOrModifyGroupError);
       };
@@ -761,8 +757,7 @@
        * Remove the group and refresh the list when done.
        */
       $scope.confirmRemoveGroup = function () {
-        $http
-          .delete("../api/groups/" + $scope.groupSelected.id + "?force=true").then(
+        $http.delete("../api/groups/" + $scope.groupSelected.id + "?force=true").then(
           function (response) {
             $rootScope.$broadcast("StatusUpdated", {
               msg: $translate.instant("groupRemoved"),
diff --git a/web-ui/src/main/resources/catalog/js/edit/DirectoryController.js b/web-ui/src/main/resources/catalog/js/edit/DirectoryController.js
index e6ca57ca5c..280d0e27e3 100644
--- a/web-ui/src/main/resources/catalog/js/edit/DirectoryController.js
+++ b/web-ui/src/main/resources/catalog/js/edit/DirectoryController.js
@@ -450,7 +450,9 @@
         if (!$scope.delEntryId) {
           return;
         }
-        gnMetadataManager.remove($scope.delEntryId).then(refreshEntriesInfo, function (e) {
+        gnMetadataManager
+          .remove($scope.delEntryId)
+          .then(refreshEntriesInfo, function (e) {
             gnAlertService.addAlert({
               msg: $translate.instant("directoryEntry-removeError-referenced"),
               delay: 5000,
diff --git a/web-ui/src/main/resources/catalog/js/edit/EditorController.js b/web-ui/src/main/resources/catalog/js/edit/EditorController.js
index e3489bbe21..d4d2232de0 100644
--- a/web-ui/src/main/resources/catalog/js/edit/EditorController.js
+++ b/web-ui/src/main/resources/catalog/js/edit/EditorController.js
@@ -264,7 +264,7 @@
                 if ($scope.metadataFound) {
                   // Default view to display is default
                   // it may be overriden by route params or custom function
-                  var defaultTab = "default";
+                  var defaultTab = "";
 
                   // It may be overriden by an application
                   // settings. For example, you may have different
diff --git a/web-ui/src/main/resources/catalog/js/search/SearchController.js b/web-ui/src/main/resources/catalog/js/search/SearchController.js
index 54bb07d5f2..ca50303f31 100644
--- a/web-ui/src/main/resources/catalog/js/search/SearchController.js
+++ b/web-ui/src/main/resources/catalog/js/search/SearchController.js
@@ -26,14 +26,12 @@
 
   goog.require("gn_catalog_service");
   goog.require("gn_searchsuggestion_service");
-  goog.require("gn_static_pages");
   goog.require("gn_usersearches");
 
   var module = angular.module("gn_search_controller", [
     "ui.bootstrap.typeahead",
     "gn_searchsuggestion_service",
     "gn_catalog_service",
-    "gn_static_pages",
     "gn_usersearches"
   ]);
 
@@ -161,7 +159,8 @@
         promise: (function () {
           var defer = $q.defer();
           $http.get("../api/tags", { cache: true }).then(function (response) {
-            var res = [];var data = response.data;
+            var res = [];
+            var data = response.data;
             for (var i = 0; i < data.length; i++) {
               res.push({
                 id: data[i].name,
diff --git a/web-ui/src/main/resources/catalog/style/gn.less b/web-ui/src/main/resources/catalog/style/gn.less
index 64830212fc..7717d2c482 100644
--- a/web-ui/src/main/resources/catalog/style/gn.less
+++ b/web-ui/src/main/resources/catalog/style/gn.less
@@ -489,9 +489,6 @@ div.thumb-small {
 }
 .gn-list-file {
   position: relative;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
   width: 100%;
   text-align: left;
   margin-bottom: 5px !important;
diff --git a/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html b/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html
index 598b670ffb..19c897e416 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/usergroup/users.html
@@ -95,8 +95,8 @@
             data-ng-disabled="!gnUserEdit.$valid && !gnUserEdit.dirty"
             data-ng-click="saveUser('#gn-user-edit')"
             id="gn-btn-user-save"
-          >
-            <i class="fa fa-save fa-fw"></i> <span data-translate="">saveUser</span>
+
+          >  <i class="fa fa-save fa-fw"></i> <span data-translate="">saveUser</span>
           </button>
           <button
             type="button"
@@ -107,7 +107,7 @@
             id="gn-btn-user-delete"
 
           >
-            <i class="fa fa-fwfa-times"></i> <span data-translate="">deleteUser</span>
+            <i class="fa fa-fw fa-fwfa-times"></i> <span data-translate="">deleteUser</span>
           </button>
         </div>
       </div>
diff --git a/web-ui/src/main/resources/catalog/templates/editor/batchedit.html b/web-ui/src/main/resources/catalog/templates/editor/batchedit.html
index 011b856a34..3d4b4e5890 100644
--- a/web-ui/src/main/resources/catalog/templates/editor/batchedit.html
+++ b/web-ui/src/main/resources/catalog/templates/editor/batchedit.html
@@ -373,7 +373,16 @@ <h1 data-translate="">batchediting</h1>
                             type="text"
                             class="form-control"
                             data-ng-model="currentXpath.condition"
-                            placeholder="{{'condition' | translate}}"/>
+                            placeholder="{{'condition' | translate}}"
+                          />
+                          <br />
+                          <input
+                            name="condition"
+                            type="text"
+                            class="form-control"
+                            data-ng-model="currentXpath.condition"
+                            placeholder="{{'condition' | translate}}"
+                          />
                           <br />
                           <textarea
                             name="xpath"
diff --git a/web-ui/src/main/resources/catalog/views/api/index.html b/web-ui/src/main/resources/catalog/views/api/index.html
index 27ad8cd37f..3366004378 100644
--- a/web-ui/src/main/resources/catalog/views/api/index.html
+++ b/web-ui/src/main/resources/catalog/views/api/index.html
@@ -42,7 +42,8 @@
           gnGlobalSettings.init(
             config,
             "http://localhost:8080/geonetwork/srv/",
-           "http://localhost:8080/geonetwork/srv/", gnViewerSettings,
+            "http://localhost:8080/geonetwork/srv/",
+            gnViewerSettings,
             gnSearchSettings
           );
         }
diff --git a/web-ui/src/main/resources/catalog/views/api/index_debug.html b/web-ui/src/main/resources/catalog/views/api/index_debug.html
index 1557df6d32..ecb0ae96dd 100644
--- a/web-ui/src/main/resources/catalog/views/api/index_debug.html
+++ b/web-ui/src/main/resources/catalog/views/api/index_debug.html
@@ -243,7 +243,8 @@
           gnGlobalSettings.init(
             config,
             "http://localhost:8080/geonetwork/srv/",
-           "http://localhost:8080/geonetwork/srv/", gnViewerSettings,
+            "http://localhost:8080/geonetwork/srv/",
+            gnViewerSettings,
             gnSearchSettings
           );
         }
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/home.html b/web-ui/src/main/resources/catalog/views/default/templates/home.html
index aecf852c07..be86a13dbc 100644
--- a/web-ui/src/main/resources/catalog/views/default/templates/home.html
+++ b/web-ui/src/main/resources/catalog/views/default/templates/home.html
@@ -129,8 +129,8 @@ <h1 class="col-md-12">
               class="sr-only"
               data-ng-model="homeFacet.key"
               data-ng-value="facetKey"
-            />
-            <span data-translate="">{{::('facet-' + facetKey) | facetKeyTranslator}}</span
+
+            /><span data-translate="">{{::('facet-' + facetKey) | facetKeyTranslator}}</span
             >&nbsp;
           </label>
         </div>
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/recordView/status.html b/web-ui/src/main/resources/catalog/views/default/templates/recordView/status.html
index 1d2de80fde..5658c5a4e4 100644
--- a/web-ui/src/main/resources/catalog/views/default/templates/recordView/status.html
+++ b/web-ui/src/main/resources/catalog/views/default/templates/recordView/status.html
@@ -1,13 +1,9 @@
 <!-- Display the first metadata status (apply to ISO19139 record) -->
-<div
-  data-ng-if="mdView.current.record.cl_status.length > 0"
-
-  class="gn-status-container"
->
+<div data-ng-if="mdView.current.record.cl_status.length > 0" class="gn-status-container">
   <div
     data-ng-if="showStatusWatermarkFor.indexOf(c.key) === -1 && showStatusTopBarFor.indexOf(c.key) === -1"
     data-ng-repeat="c in mdView.current.record.cl_status track by $index"
-    class="gn-status gn-status-{{c.key}}  gn-status-md"
+    class="gn-status gn-status-{{c.key}} gn-status-md"
   >
     {{c.key | translate}}
   </div>
diff --git a/web-ui/src/main/resources/catalog/views/default/templates/results.html b/web-ui/src/main/resources/catalog/views/default/templates/results.html
index 5567d02803..5fbef27414 100644
--- a/web-ui/src/main/resources/catalog/views/default/templates/results.html
+++ b/web-ui/src/main/resources/catalog/views/default/templates/results.html
@@ -118,7 +118,7 @@
               data-template-url="resultTemplate"
               data-map="searchObj.searchMap"
             ></div>
-</div>
+          </div>
         </div>
         <div class="row gn-row-tools gn-noborder-bottom hidden-print">
           <div class="col-sm-3">
@@ -127,9 +127,10 @@
               class="btn btn-link hidden-print"
               onClick="window.scrollTo(0,0);"
               title="{{'scrollTop' | translate}}"
-
-              ><i class="fa fa-fw fa-chevron-up" />
-            </button></div>
+            >
+              <i class="fa fa-fw fa-chevron-up" />
+            </button>
+          </div>
           <div class="col-xs-12 col-sm-6 text-center">
             <div
               class=""
@@ -143,7 +144,7 @@
       </div>
     </div>
 
-    <div ng-if="searchMapPlacement === 'results'" class="hidden-print" class="hidden-print">
+    <div ng-if="searchMapPlacement === 'results'" class="hidden-print">
       <div
         data-gn-map-field="searchObj.searchMap"
         data-gn-map-field-geom="searchObj.params.geometry"
diff --git a/web/pom.xml b/web/pom.xml
index 4500dbda51..4ebd916c00 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -63,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j18-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -285,10 +285,6 @@
       <groupId>com.github.librepdf</groupId>
       <artifactId>openpdf</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.github.librepdf</groupId>
-      <artifactId>openpdf</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.mapfish.print</groupId>
       <artifactId>print-lib</artifactId>
@@ -301,10 +297,6 @@
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
         <!--
         <exclusion>
           <groupId>com.codahale.metrics</groupId>
@@ -371,23 +363,19 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>gn-core</artifactId>
-      <version>4.2.6-georchestra</version>
+      <version>${project.version}</version>
       <exclusions>
         <exclusion>
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>javax.annotation</groupId>
-          <artifactId>jsr250-api</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>gn-services</artifactId>
-      <version>4.2.6-georchestra</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -419,17 +407,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>gn-georchestra-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>gn-georchestra-authnz</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <!-- Handled locally by a temporarly repository -->
     <dependency>
       <groupId>dlib</groupId>
@@ -495,7 +472,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>gn-web-ui</artifactId>
-      <version>4.2.6-georchestra</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -508,14 +485,14 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>gn-core</artifactId>
-      <version>4.2.6-georchestra</version>
+      <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>gn-services</artifactId>
-      <version>4.2.6-georchestra</version>
+      <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -648,45 +625,42 @@
     <plugins>
       <!-- Generate a properties file with the commit hash to be displayed on the admin.console -->
 	    <plugin>
-          <groupId>io.github.git-commit-id</groupId>
-          <artifactId>git-commit-id-maven-plugin</artifactId>
-          <version>4.9.9</version>
-	        <executions>
-                  <execution>
-                    <phase>initialize</phase>
-	                  <id>get-the-git-infos</id>
-	                <goals>
-	                    <goal>revision</goal>
-	                </goals>
-	            </execution>
-	        </executions>
-	        <configuration>
-	            <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
-	            <prefix>git</prefix>
-	            <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
-	            <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
-	            <verbose>false</verbose>
-	            <generateGitPropertiesFile>true</generateGitPropertiesFile>
-	            <generateGitPropertiesFilename>src/main/webResources/WEB-INF/classes/git.properties</generateGitPropertiesFilename>
-	            <!-- Denotes the format to save properties in. Valid options are "properties" (default) and "json". Properties will be saved to the generateGitPropertiesFilename if generateGitPropertiesFile is set to `true`. -->
-	            <format>properties</format>
-	            <skipPoms>true</skipPoms>
-	            <injectAllReactorProjects>true</injectAllReactorProjects>
-              <injectIntoSysProperties>true</injectIntoSysProperties>
-	            <failOnNoGitDirectory>false</failOnNoGitDirectory>
-	            <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
-	            <skip>false</skip>
-	            <runOnlyOnce>false</runOnlyOnce>
-	            <excludeProperties>
-	            </excludeProperties>
-							<includeOnlyProperties>
-								<includeOnlyProperty>^git.tags$</includeOnlyProperty>
-								<includeOnlyProperty>^git.branch$</includeOnlyProperty>
-								<includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
-                <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
-                <includeOnlyProperty>^git.closest.tag.name$</includeOnlyProperty>
-                <includeOnlyProperty>^git.closest.tag.commit.count$</includeOnlyProperty>
-                <includeOnlyProperty>^git.commit.id.describe.*$</includeOnlyProperty>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+        <version>4.9.9</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <id>get-the-git-infos</id>
+            <goals>
+                <goal>revision</goal>
+            </goals>
+          </execution>
+        </executions>
+
+        <configuration>
+          <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
+          <prefix>git</prefix>
+          <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+          <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+          <verbose>false</verbose>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <generateGitPropertiesFilename>src/main/webResources/WEB-INF/classes/git.properties</generateGitPropertiesFilename>
+          <!-- Denotes the format to save properties in. Valid options are "properties" (default) and "json". Properties will be saved to the generateGitPropertiesFilename if generateGitPropertiesFile is set to `true`. -->
+          <format>properties</format>
+          <skipPoms>true</skipPoms>
+          <injectAllReactorProjects>true</injectAllReactorProjects>
+          <failOnNoGitDirectory>false</failOnNoGitDirectory>
+          <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+          <skip>false</skip>
+          <runOnlyOnce>false</runOnlyOnce>
+          <excludeProperties>
+          </excludeProperties>
+          <includeOnlyProperties>
+            <includeOnlyProperty>^git.tags$</includeOnlyProperty>
+            <includeOnlyProperty>^git.branch$</includeOnlyProperty>
+            <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+            <includeOnlyProperty>^git.commit.id.describe.*$</includeOnlyProperty>
             <includeOnlyProperty>^git.build.time$</includeOnlyProperty>
           </includeOnlyProperties>
           <replacementProperties>
@@ -771,8 +745,7 @@
                   <includes>
                     <include>META-INF/MANIFEST.MF</include>
                     <include>data/**</include>
-                      <include>doc/en/**</include>
-                      <include>doc/fr/**</include>
+                    <include>doc/**</include>
                     <include>images/logos/*</include>
                     <include>images/logos/statTmp</include>
                     <include>scripts/lib/**</include>
@@ -1330,288 +1303,6 @@
       </dependencies>
     </profile>
 
-    <!-- specific to geOrchestra build -->
-    <profile>
-      <id>debianPackage</id>
-      <properties>
-        <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
-      </properties>
-      <build>
-        <finalName>geonetwork</finalName>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-              <classifier>generic</classifier>
-              <archiveClasses>false</archiveClasses>
-              <attachClasses>false</attachClasses>
-              <webResources>
-                <resource>
-                  <directory>${project.basedir}/../schemas</directory>
-                  <includes>
-                    <include>**/src/main/plugin/*</include>
-                  </includes>
-                  <targetPath>WEB-INF/data/config/schema_plugins</targetPath>
-                </resource>
-                <resource>
-                  <directory>${project.basedir}/../web-ui/src/main/resources</directory>
-                </resource>
-                <resource>
-                  <directory>${build.webapp.resources}</directory>
-                </resource>
-              </webResources>
-              <packagingExcludes>
-                xml/schemas/**,
-                catalog/lib/style/bootstrap/docs/**,
-                catalog/lib/style/bootstrap/fonts/**,
-                catalog/lib/style/bootstrap/grunt/**,
-                catalog/lib/style/bootstrap/test-infra/**,
-                catalog/lib/style/font-awesome/css/**,
-                catalog/lib/style/font-awesome/src/**,
-                catalog/lib/style/font-awesome/scss/**
-              </packagingExcludes>
-              <webXml>${build.webapp.resources}/WEB-INF/web.xml</webXml>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.5</version>
-            <executions>
-              <execution>
-                <id>copy-filter-webResource</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <includeEmptyDirs>false</includeEmptyDirs>
-                  <outputDirectory>${build.webapp.resources}</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>${basedir}/src/main/webResources</directory>
-                      <filtering>true</filtering>
-                      <targetPath>${build.webapp.resources}</targetPath>
-                    </resource>
-                  </resources>
-                  <filters>
-                    <filter>${basedir}/src/main/filters/${env}.properties</filter>
-                  </filters>
-                  <overwrite>true</overwrite>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-plugin</artifactId>
-            <version>1.9.4</version>
-            <configuration>
-              <checkoutDirectory>${project.build.directory}/deb/etc/georchestra</checkoutDirectory>
-              <connectionUrl>scm:git:https://github.com/georchestra/datadir.git</connectionUrl>
-              <pushChanges>false</pushChanges>
-              <scmVersion>22.0</scmVersion>
-              <scmVersionType>branch</scmVersionType>
-            </configuration>
-            <executions>
-              <execution>
-                <id>checkout-deb-default-datadir</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>checkout</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.7</version>
-            <executions>
-              <execution>
-                <id>remove-useless-directories</id>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <delete includeemptydirs="true">
-                      <fileset defaultexcludes="false" dir="${project.build.directory}/deb/etc/georchestra">
-                        <include name="**/*" />
-                        <exclude name="geonetwork/**" />
-                      </fileset>
-                    </delete>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>fix-permissions</id>
-                <phase>package</phase>
-                <configuration>
-                  <target>
-                    <chmod perm="ugo+x">
-                      <fileset dir="${basedir}/target/deb">
-                        <include name="**/bin/**"/>
-                        <include name="**/sbin/**"/>
-                        <include name="DEBIAN/post*"/>
-                        <include name="DEBIAN/pre*"/>
-                      </fileset>
-                    </chmod>
-                  </target>
-                </configuration>
-                <goals><goal>run</goal></goals>
-              </execution>
-              <execution>
-                <id>set-project-packageversion</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <exportAntProperties>true</exportAntProperties>
-                  <target>
-                    <condition property="project.packageVersion"
-                               value="99.master.${maven.build.timestamp}~${git.commit.id.abbrev}"
-                               else="${project.version}.${maven.build.timestamp}~${git.commit.id.abbrev}">
-                      <matches string="${project.version}" pattern="SNAPSHOT$" />
-                    </condition>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>net.sf.debian-maven</groupId>
-            <artifactId>debian-maven-plugin</artifactId>
-            <version>1.0.6</version>
-            <configuration>
-              <packageName>georchestra-geonetwork</packageName>
-              <packageDescription>Debian package for the GeoNetwork fork of geOrchestra.</packageDescription>
-              <packageVersion>${project.packageVersion}</packageVersion>
-              <projectUrl>http://www.georchestra.org/</projectUrl>
-              <projectOrganization>geOrchestra</projectOrganization>
-              <maintainerName>PSC</maintainerName>
-              <maintainerEmail>psc@georchestra.org</maintainerEmail>
-              <excludeAllArtifacts>true</excludeAllArtifacts>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>docker</id>
-      <properties>
-        <dockerImageName>georchestra/${project.parent.artifactId}:${git.closest.tag.name}-dev</dockerImageName>
-        <dockerDatadirScmUrl>scm:git:https://github.com/georchestra/datadir.git</dockerDatadirScmUrl>
-        <dockerDatadirScmVersion>docker-master</dockerDatadirScmVersion>
-        <dockerGnDatadirScmUrl>scm:git:https://github.com/georchestra/geonetwork_minimal_datadir.git</dockerGnDatadirScmUrl>
-        <dockerGnDatadirScmVersion>gn4.2.2</dockerGnDatadirScmVersion>
-
-      </properties>
-      <build>
-        <finalName>geonetwork</finalName>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-plugin</artifactId>
-            <version>1.9.4</version>
-            <executions>
-              <execution>
-                <id>checkout-docker-default-datadir</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>checkout</goal>
-                </goals>
-                <configuration>
-                  <checkoutDirectory>${project.build.directory}/datadir/</checkoutDirectory>
-                  <connectionUrl>${dockerDatadirScmUrl}</connectionUrl>
-                  <pushChanges>false</pushChanges>
-                  <scmVersion>${dockerDatadirScmVersion}</scmVersion>
-                  <scmVersionType>branch</scmVersionType>
-                </configuration>
-              </execution>
-              <execution>
-                <id>checkout-docker-gn-datadir</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>checkout</goal>
-                </goals>
-                <configuration>
-                  <checkoutDirectory>${project.build.directory}/gn_datadir/</checkoutDirectory>
-                  <connectionUrl>${dockerGnDatadirScmUrl}</connectionUrl>
-                  <pushChanges>false</pushChanges>
-                  <scmVersion>${dockerGnDatadirScmVersion}</scmVersion>
-                  <scmVersionType>branch</scmVersionType>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.spotify</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <version>0.3.8</version>
-            <configuration>
-              <imageName>${dockerImageName}</imageName>
-              <dockerDirectory>${project.basedir}/src/docker</dockerDirectory>
-              <resources>
-                <resource>
-                  <targetPath>/var/lib/jetty/webapps</targetPath>
-                  <directory>${project.build.directory}</directory>
-                  <include>geonetwork/**</include>
-                </resource>
-                <resource>
-                  <targetPath>/etc/georchestra</targetPath>
-                  <directory>${project.build.directory}/datadir</directory>
-                  <include>${project.parent.artifactId}/**</include>
-                </resource>
-                <resource>
-                  <targetPath>/mnt/geonetwork_datadir</targetPath>
-                  <directory>${project.build.directory}/gn_datadir</directory>
-                  <exclude>.git**</exclude>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-              <serverId>docker-hub</serverId>
-              <registryUrl>https://index.docker.io/v1/</registryUrl>
-            </configuration>
-            <dependencies>
-              <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>19.0</version>
-              </dependency>
-              <dependency>
-                <groupId>javax.activation</groupId>
-                <artifactId>activation</artifactId>
-                <version>1.1.1</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>log4j-logstash</id>
-      <dependencies>
-        <dependency>
-          <groupId>net.logstash.log4j</groupId>
-          <artifactId>jsonevent-layout</artifactId>
-          <version>1.7</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>sentry-log4j</id>
-      <dependencies>
-        <dependency>
-          <groupId>io.sentry</groupId>
-          <artifactId>sentry-log4j</artifactId>
-          <version>1.7.30</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
     <profile>
       <id>war</id>
       <dependencies>
@@ -1637,6 +1328,5 @@
     <build.webapp.resources>${project.build.directory}/webapp</build.webapp.resources>
     <rootProjectDir>${basedir}/..</rootProjectDir>
     <wro4jOutput>${project.build.directory}/wro4j-output/</wro4jOutput>
-
   </properties>
 </project>
diff --git a/web/src/main/webResources/WEB-INF/config-db/database_migration.xml b/web/src/main/webResources/WEB-INF/config-db/database_migration.xml
index a8396b534e..2373cf4e09 100644
--- a/web/src/main/webResources/WEB-INF/config-db/database_migration.xml
+++ b/web/src/main/webResources/WEB-INF/config-db/database_migration.xml
@@ -165,6 +165,21 @@
         <value>WEB-INF/classes/setup/sql/migrate/v425/migrate-db-</value>
       </list>
     </entry>
+    <entry key="4.0.0">
+      <list>
+        <value>WEB-INF/classes/setup/sql/migrate/v400/migrate-db-</value>
+      </list>
+    </entry>
+    <entry key="4.2.4">
+      <list>
+        <value>WEB-INF/classes/setup/sql/migrate/v424/migrate-db-</value>
+      </list>
+    </entry>
+    <entry key="4.2.5">
+      <list>
+        <value>WEB-INF/classes/setup/sql/migrate/v425/migrate-db-</value>
+      </list>
+    </entry>
   </util:map>
 
 
@@ -381,15 +396,5 @@
         <value>WEB-INF/classes/setup/sql/migrate/v426/migrate-</value>
       </list>
     </entry>
-    <entry key="4.2.1">
-      <list>
-        <value>WEB-INF/classes/setup/sql/migrate/v421/migrate-</value>
-      </list>
-    </entry>
-    <entry key="4.2.2">
-      <list>
-        <value>WEB-INF/classes/setup/sql/migrate/v422/migrate-</value>
-      </list>
-    </entry>
   </util:map>
 </beans>
diff --git a/web/src/main/webResources/WEB-INF/data/config/index/records.json b/web/src/main/webResources/WEB-INF/data/config/index/records.json
index 5e1f671762..5e6d81feb0 100644
--- a/web/src/main/webResources/WEB-INF/data/config/index/records.json
+++ b/web/src/main/webResources/WEB-INF/data/config/index/records.json
@@ -1167,7 +1167,7 @@
                 "fields": {
                   "keyword": {
                     "type": "keyword",
-                    "ignore_above": 256
+                    "ignore_above": ${es.index.ignore_above}
                   }
                 }
               },
@@ -1299,6 +1299,10 @@
                   "any.langdut"
                 ]
               },
+              "langdut": {
+                "type": "keyword",
+                "copy_to": ["any.langger"]
+              },
               "langdut": {
                 "type": "keyword",
                 "copy_to": [
@@ -1534,6 +1538,10 @@
             "type": "keyword",
             "copy_to": ["any.langger"]
           },
+          "langdut": {
+            "type": "keyword",
+            "copy_to": ["any.langger"]
+          },
           "langdut": {
             "type": "keyword",
             "copy_to": [
@@ -1542,8 +1550,7 @@
           },
           "langdut": {
             "type": "keyword",
-            "copy_to": [
-              "any.langdut"
+            "copy_to": ["any.langdut"
               ]
           },
           "langita": {
@@ -1837,6 +1844,14 @@
           }
         }
       },
+      "resourceTypeNameObject": {
+        "type": "object",
+        "properties": {
+          "default": {
+            "type": "keyword"
+          }
+        }
+      },
       "resourceIdentifier": {
         "type": "object",
         "properties": {
diff --git a/web/src/main/webResources/WEB-INF/web.xml b/web/src/main/webResources/WEB-INF/web.xml
index ea38923070..51b99913ca 100644
--- a/web/src/main/webResources/WEB-INF/web.xml
+++ b/web/src/main/webResources/WEB-INF/web.xml
@@ -283,11 +283,6 @@
     <url-pattern>/config/*</url-pattern>
   </filter-mapping>
 
-  <filter-mapping>
-    <filter-name>resources</filter-name>
-    <url-pattern>/config/*</url-pattern>
-  </filter-mapping>
-
   <filter-mapping>
     <filter-name>resources</filter-name>
     <url-pattern>/images/harvesting/*</url-pattern>
@@ -460,7 +455,7 @@
     <servlet-class>org.fao.geonet.proxy.URITemplateProxyServlet</servlet-class>
     <init-param>
       <param-name>targetUri</param-name>
-      <param-value>es.featureproxy.targeturi</param-value>
+      <param-value>${es.url}/${es.index.features}/{_}</param-value>
     </init-param>
     <init-param>
       <param-name>log</param-name>
@@ -494,7 +489,7 @@
     <servlet-class>org.fao.geonet.proxy.URITemplateProxyServlet</servlet-class>
     <init-param>
       <param-name>targetUri</param-name>
-      <param-value>kb.url</param-value>
+      <param-value>${kb.url}</param-value>
     </init-param>
     <init-param>
       <param-name>log</param-name>
diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml b/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
index cee5f817ac..bef5a1edac 100644
--- a/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
+++ b/web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
@@ -238,7 +238,6 @@
         <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/atom/describe/service!?.*" access="permitAll"/>
         <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/atom/describe/dataset!?.*" access="permitAll"/>
         <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/atom/download/dataset!?.*" access="permitAll"/>
-
         <!-- Metadata identifier templates -->
         <sec:intercept-url pattern="/[a-zA-Z0-9_\-]+/[a-z]{2,3}/metadataIdentifierTemplates!?.*"
                            access="hasAuthority('Editor')"/>
diff --git a/web/src/main/webapp/xslt/services/sitemap/sitemap.xsl b/web/src/main/webapp/xslt/services/sitemap/sitemap.xsl
index 15adbb32d4..e97297e331 100644
--- a/web/src/main/webapp/xslt/services/sitemap/sitemap.xsl
+++ b/web/src/main/webapp/xslt/services/sitemap/sitemap.xsl
@@ -33,10 +33,6 @@
   <xsl:variable name="indexDocs" select="/root/response/indexDocs"/>
   <xsl:variable name="changeDate" select="/root/response/changeDate"/>
 
-  <xsl:variable name="sitemapLinkUrl"
-                select="util:getSettingValue('system/server/sitemapLinkUrl')"/>
-
-
   <xsl:template match="/root">
     <xsl:choose>
       <!-- Return index document -->
@@ -124,13 +120,7 @@
                 <xsl:value-of select="concat($nodeUrl, 'api/records/', $uuid, '/formatters/xml')"/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:variable name="metadataUrl">
-                  <xsl:choose>
-                    <xsl:when test="contains(upper-case(normalize-space($sitemapLinkUrl)), '{{UUID}}')"><xsl:value-of select="replace($sitemapLinkUrl, '\{\{UUID\}\}', $uuid, 'i' )"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="util:getPermalink($uuid, $lang)"/></xsl:otherwise>
-                  </xsl:choose>
-                </xsl:variable>
-                <xsl:value-of select="$metadataUrl"/>
+                <xsl:value-of select="util:getPermalink($uuid, $lang)"/>
               </xsl:otherwise>
             </xsl:choose>
           </loc>
diff --git a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
index 5bdf0c353d..55727ac8cd 100644
--- a/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/form-configurator.xsl
@@ -324,7 +324,7 @@
                     select="gn-fn-metadata:check-elementandsession-visibility(
                   $schema, $base, $serviceInfo, @if, @displayIfServiceInfo)"/>
 
-      <!--
+      <!-- 
       <xsl:message> Field: <xsl:value-of select="@name"/></xsl:message>
       <xsl:message>Xpath: <xsl:copy-of select="@xpath"/></xsl:message>
       <xsl:message>TemplateModeOnly: <xsl:value-of select="@templateModeOnly"/></xsl:message>
diff --git a/workers/pom.xml b/workers/pom.xml
index 034247f56f..fd384a94a3 100644
--- a/workers/pom.xml
+++ b/workers/pom.xml
@@ -94,7 +94,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j18-impl</artifactId>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
diff --git a/workers/wfsfeature-harvester/src/main/java/org/fao/geonet/harvester/wfsfeatures/worker/WFSDataStoreWithStrategyInvestigator.java b/workers/wfsfeature-harvester/src/main/java/org/fao/geonet/harvester/wfsfeatures/worker/WFSDataStoreWithStrategyInvestigator.java
index 17442f84da..4849f8a7fa 100644
--- a/workers/wfsfeature-harvester/src/main/java/org/fao/geonet/harvester/wfsfeatures/worker/WFSDataStoreWithStrategyInvestigator.java
+++ b/workers/wfsfeature-harvester/src/main/java/org/fao/geonet/harvester/wfsfeatures/worker/WFSDataStoreWithStrategyInvestigator.java
@@ -23,7 +23,6 @@
 
 package org.fao.geonet.harvester.wfsfeatures.worker;
 
-import org.geotools.http.HTTPClient;
 import org.geotools.data.wfs.WFSDataStore;
 import org.geotools.data.wfs.WFSDataStoreFactory;
 import org.geotools.data.wfs.internal.WFSConfig;