diff --git a/core/pom.xml b/core/pom.xml
index 1b010541e3c..36ee42ae577 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -340,10 +340,6 @@
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>xmlgraphics-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
diff --git a/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java b/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java
index a254a26c3f0..8718d565fa8 100644
--- a/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java
+++ b/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java
@@ -186,6 +186,7 @@ public Element execute() throws Exception {
 
     public void setCredentials(String username, String password) {
         client.setCredentials(username, password);
+        client.setPreemptiveBasicAuth(true);
     }
 
     //---------------------------------------------------------------------------
diff --git a/docs/manual/docs/administrator-guide/managing-users-and-groups/index.md b/docs/manual/docs/administrator-guide/managing-users-and-groups/index.md
index d05f35d0354..aa0408ce3f4 100644
--- a/docs/manual/docs/administrator-guide/managing-users-and-groups/index.md
+++ b/docs/manual/docs/administrator-guide/managing-users-and-groups/index.md
@@ -76,3 +76,125 @@ Rights associated with the roles are illustrated in detail in the list below:
     The Registered User has more access privileges than non-authenticated Guest users:
 
     -   Right to download protected data.
+
+## Role and feature Matrix
+
+The tables below show a comprehensive overview of Roles and Features, it explains in detail what role can do what in GeoNetwork.
+
+| Code  | Description |
+| ----- | ----- |
+| UI    | Feature visible in the UI, but not usable by the user profile |
+| EDIT  | The user can edit the metadata imported by the user |
+| DEL   | The user can delete the metadata imported by the user | 
+
+=== "Search"
+
+    |                                             | Anonymous user          |     Registered User     | Editor| Reviewer|       User Admin        |     Admini- strator     |
+    |---------------------------------------------| :---: |:-----------------------:| :---: | :---: |:-----------------------:|:-----------------------:|
+    | Metadata selection / Export (ZIP)           | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Export (PDF)           | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Export (CSV)           | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Selection only         | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Update privileges      |                         |                         | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Publish                |                         |                         | | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Unpublish              |                         |                         | | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Approve                |                         |                         | | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Transfer Ownership     |                         |                         | | | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Validate               |                         |                         | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Validate records links |                         |                         | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Updates categories     |                         |                         | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Delete                 |                         |                         | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Metadata selection / Index records          |                         |                         | | | :material-check-circle: | :material-check-circle: |
+    | Preferred Records                           | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Watch list                                  | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | "Sorted by relevancy,  modified,  title..." | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+
+=== "Metadata Page"
+ 
+    |                                             | Anonymous user          |     Registered User     | Editor| Reviewer|       User Admin        |     Admini- strator     |
+    |---------------------------------------------| :---: |:-----------------------:| :---: | :---: |:-----------------------:|:-----------------------:|
+    | Edit| | | :material-check-circle: | :material-check-circle: |          EDIT           | :material-check-circle: |
+    | Delete| | | :material-check-circle: | :material-check-circle: |           DEL           | :material-check-circle: |
+    | Cancel working copy| | | :material-check-circle: | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Privileges| | | :material-check-circle: | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Transfer Ownership| | | | |                         | :material-check-circle: |
+    | Manage Record / Unpublish| | | | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Publish| | | | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Work flow / submit for review| | | :material-check-circle: | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Work flow / directly approve metadata| | | | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Work flow / approve metadata | | | | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Work flow / reject approval submision| | | | :material-check-circle: |                         | :material-check-circle: |
+    | Manage Record / Work flow / cancel approval submission| | | :material-check-circle: | |                         | :material-check-circle: |
+    | Manage Record / DOI Creation request| | | :material-check-circle: | :material-check-circle: |           UI            | :material-check-circle: |
+    | Manage Record / Duplicate| | | :material-check-circle: | :material-check-circle: |           UI            | :material-check-circle: |
+    | Download record / Permalink| :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Download record / Export (ZIP)| :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Download record / Export (PDF)| :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Download record / Export (XML)| :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Download record / EXport (RDF)| :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+
+=== "Editor"
+
+    |                                             | Anonymous user          |     Registered User     | Editor| Reviewer|       User Admin        |     Admini- strator     |
+    |---------------------------------------------| :---: |:-----------------------:| :---: | :---: |:-----------------------:|:-----------------------:|
+    | Editor board| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Add new record| | | :material-check-circle: | :material-check-circle: |           UI            | :material-check-circle: |
+    | Import new records| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Manage directory| | | :material-check-circle: | :material-check-circle: |           UI            | :material-check-circle: |
+    | Batch editing| | | :material-check-circle: | :material-check-circle: |          EDIT           | :material-check-circle: |
+    | Access rights| | | | |                         | :material-check-circle: |
+    | Editor board / Export (ZIP)| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / EXport (PDF)| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Export (CSV)| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Selection only| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Updates privileges| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Publish| | | | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Unpublish| | | | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Approve| | | | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Transfer Ownership| | | | | :material-check-circle: | :material-check-circle: |
+    | Editor board / Validate| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Validate record links| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Updates categories| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | | | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Delete| | | :material-check-circle: | :material-check-circle: | :material-check-circle: | :material-check-circle: |
+    | Editor board / Index records| | | | | :material-check-circle: | :material-check-circle: |
+
+=== "Administration"
+
+    |                                             | Anonymous user          |     Registered User     | Editor| Reviewer|       User Admin        |     Admini- strator     |
+    |---------------------------------------------| :---: |:-----------------------:| :---: | :---: |:-----------------------:|:-----------------------:|
+    | Summary| | | | | | :material-check-circle: |
+    | Metadata and Templates| | | | | | :material-check-circle: |
+    | Metadata and Templates / Standards| | | | | | :material-check-circle: |
+    | Metadata and Templates / Formatter| | | | | | :material-check-circle: |
+    | Metadata and Templates / Validation| | | | | | :material-check-circle: |
+    | Metadata and Templates / Metadata Identifier templates| | | | | | :material-check-circle: |
+    | Users and groups / Manage groups| | | | | :material-check-circle: | :material-check-circle: |
+    | Users and groups / Manage users| | | | | :material-check-circle: | :material-check-circle: |
+    | Harvesting / Catalogo harvesters| | | | | :material-check-circle: | :material-check-circle: |
+    | Harvesting / Catalogo harvesters report| | | | | :material-check-circle: | :material-check-circle: |
+    | Harvesting / Feature harvesters| | | | | :material-check-circle: | :material-check-circle: |
+    | Statistics and status / Status| | | | | | :material-check-circle: |
+    | Statistics and status / Record links analysis| | | | | :material-check-circle: | :material-check-circle: |
+    | Statistics and status / Information| | | | | | :material-check-circle: |
+    | Statistics and status / Versioning| | | | | | :material-check-circle: |
+    | Statistics and status / Content statistics| | | | | :material-check-circle: | :material-check-circle: |
+    | Reports / Update matadata| | | | | :material-check-circle: | :material-check-circle: |
+    | Reports / Internal metadata| | | | | :material-check-circle: | :material-check-circle: |
+    | Reports / Metadata file uploads| | | | | :material-check-circle: | :material-check-circle: |
+    | Reports / Metadata file dowloads| | | | | :material-check-circle: | :material-check-circle: |
+    | Reports / Users access| | | | | :material-check-circle: | :material-check-circle: |
+    | Classification systems / Theaurus| | | | | | :material-check-circle: |
+    | Classification systems / Category| | | | | | :material-check-circle: |
+    | Settings / Settings| | | | | | :material-check-circle: |
+    | Settings / User interface| | | | | :material-check-circle: | :material-check-circle: |
+    | Settings / CSS and Style| | | | | | :material-check-circle: |
+    | Settings / Logo| | | | | | :material-check-circle: |
+    | Settings / Sources| | | | | :material-check-circle: | :material-check-circle: |
+    | Settings / CSW| | | | | | :material-check-circle: |
+    | Settings / CSW test| | | | | | :material-check-circle: |
+    | Settings / Map servers| | | | | | :material-check-circle: |
+    | Settings / Static pages| | | | | | :material-check-circle: |
+    | Tools / Catalogue admin tools| | | | | | :material-check-circle: |
+    | Tools / Batch process| | | | | | :material-check-circle: |
+    | Tools / Transfer ownership| | | | | | :material-check-circle: |
diff --git a/pom.xml b/pom.xml
index d6699fae764..61e3bcfedf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -525,7 +525,7 @@
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>1.3.3</version>
+        <version>1.5</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
diff --git a/services/pom.xml b/services/pom.xml
index d95e6fa9990..8d749eaf07f 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -222,6 +222,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-csv</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
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 4ff822de1b4..527e6f8b2ae 100644
--- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
+++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
@@ -380,7 +380,9 @@
           // and is depending on each schema. If emtpy an empty array is set.
           var getLayerConfiguration = function () {
             var configuration = angular.fromJson(getInputValue("layerConfig")) || [];
-            return Array.isArray(configuration) ? configuration : [configuration.resource];
+            return Array.isArray(configuration)
+              ? configuration
+              : [configuration.resource];
           };
 
           var extent = [],
diff --git a/web/pom.xml b/web/pom.xml
index c27f820ec45..764ffe4f8b6 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -227,10 +227,6 @@
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>xmlgraphics-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>