diff --git a/.env.sample b/.env.sample
index 3d2f6441a8..328efe6221 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,4 +1,4 @@
-NUXEO_WEB_UI_VERSION=3.1.14-SNAPSHOT
+NUXEO_WEB_UI_VERSION=3.1.16-SNAPSHOT
 NUXEO_VERSION=master
 NUXEO_PACKAGES=nuxeo-drive nuxeo-liveconnect nuxeo-template-rendering
 NUXEO_DEV_MODE=true
diff --git a/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js b/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js
index beb8e5ae1d..67d312373a 100644
--- a/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js
+++ b/addons/nuxeo-csv/elements/nuxeo-document-import-csv.js
@@ -276,7 +276,7 @@ Polymer({
           <template is="dom-if" if="[[!hasFile]]">
             <div class="vertical layout center center-justified flex">
               <div class="dropzone-label horizontal layout center center-justified">
-                <a href="javascript:undefined" on-tap="_showUploadDialog"> [[i18n('csv.import.clickOrDrop')]]</a>
+                <a href="#" on-tap="_showUploadDialog"> [[i18n('csv.import.clickOrDrop')]]</a>
               </div>
             </div>
           </template>
@@ -581,7 +581,8 @@ Polymer({
     }
   },
 
-  _showUploadDialog() {
+  _showUploadDialog(e) {
+    e.preventDefault();
     this.$.uploadFiles.click();
   },
 
diff --git a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js
index 8802d63579..19ed50997c 100644
--- a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js
+++ b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-box-link.js
@@ -64,7 +64,7 @@ Polymer({
       is-available="{{isProviderAvailable}}"
     ></nuxeo-liveconnect-box-provider>
     <template is="dom-if" if="[[isProviderAvailable]]">
-      <a href="javascript:undefined" on-tap="_openPicker">
+      <a href="#" on-tap="_openPicker">
         <iron-icon src="[[importPath]]images/box.png"></iron-icon>
         [[i18n('liveconnectImportActions.box', 'Box')]]
       </a>
@@ -78,7 +78,8 @@ Polymer({
     this.$.provider.updateProviderInfo();
   },
 
-  _openPicker() {
+  _openPicker(e) {
+    e.preventDefault();
     this.$.provider.openPicker();
   },
 });
diff --git a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js
index efbc2d8b24..5f342a0c9b 100644
--- a/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js
+++ b/addons/nuxeo-liveconnect/elements/nuxeo-liveconnect-google-drive-link.js
@@ -64,7 +64,7 @@ Polymer({
       is-available="{{isProviderAvailable}}"
     ></nuxeo-liveconnect-google-drive-provider>
     <template is="dom-if" if="[[isProviderAvailable]]">
-      <a href="javascript:undefined" on-tap="_openPicker">
+      <a href="#" on-tap="_openPicker">
         <iron-icon src="[[importPath]]images/google_drive.png"></iron-icon>
         [[i18n('liveconnectImportActions.googledrive', 'Google Drive')]]
       </a>
@@ -78,7 +78,8 @@ Polymer({
     this.$.provider.updateProviderInfo();
   },
 
-  _openPicker() {
+  _openPicker(e) {
+    e.preventDefault();
     this.$.provider.openPicker();
   },
 });
diff --git a/charts/preview/Chart.yaml b/charts/preview/Chart.yaml
index 7d7254a8b8..e31e1fa05f 100644
--- a/charts/preview/Chart.yaml
+++ b/charts/preview/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 description: A Helm chart for Web UI preview
 icon: https://media.licdn.com/dms/image/C4D0BAQFPXiXFrp4LBA/company-logo_200_200/0?e=2159024400&v=beta&t=RW9EU0QUciUVuPSpLySd9FtJ2yG-O37_hAAvc32f6ro
 name: preview
-version: 3.1.14-SNAPSHOT
+version: 3.1.16-SNAPSHOT
diff --git a/elements/nuxeo-app.js b/elements/nuxeo-app.js
index 8153a3cff8..320050a355 100644
--- a/elements/nuxeo-app.js
+++ b/elements/nuxeo-app.js
@@ -539,6 +539,10 @@ Polymer({
       value: '52px',
     },
 
+    sidebarWidth: {
+      type: String,
+    },
+
     drawerOpened: {
       type: Boolean,
       value: false,
@@ -638,7 +642,7 @@ Polymer({
 
   ready() {
     this.$.drawerPanel.closeDrawer();
-
+    this.drawerWidth = this.sidebarWidth = getComputedStyle(this).getPropertyValue('--nuxeo-sidebar-width');
     this.$.drawerPanel.$.drawer.addEventListener('transitionend', () => {
       this.$.drawerPanel.notifyResize();
     });
@@ -1001,7 +1005,8 @@ Polymer({
   },
 
   _openDrawer() {
-    this.drawerWidth = '350px';
+    const pixelsSuffix = 'px';
+    this.drawerWidth = 298 + Math.round(this.sidebarWidth.substring(0, this.sidebarWidth.length - 2)) + pixelsSuffix;
     this.drawerOpened = true;
     const { drawerPanel } = this.$;
     if (drawerPanel.narrow) {
@@ -1017,7 +1022,7 @@ Polymer({
   },
 
   _closeDrawer() {
-    this.drawerWidth = '52px';
+    this.drawerWidth = this.sidebarWidth;
     this.drawerOpened = false;
     this.$.drawerPanel.closeDrawer();
     this.selectedTab = '';
diff --git a/elements/nuxeo-results/nuxeo-results.js b/elements/nuxeo-results/nuxeo-results.js
index d9c3ea6036..ab2cfc8311 100644
--- a/elements/nuxeo-results/nuxeo-results.js
+++ b/elements/nuxeo-results/nuxeo-results.js
@@ -455,9 +455,17 @@ Polymer({
   },
 
   _computeCountLabel() {
-    return this.resultsCount < 0
-      ? this.i18n('results.heading.count.unknown')
-      : this.i18n('results.heading.count', this.resultsCount);
+    // Fetch the property value from web-ui-properties.xml
+    const isNumberFormattingEnabled =
+      (Nuxeo && Nuxeo.UI && Nuxeo.UI.config && Nuxeo.UI.config.numberFormattingEnabled) || false;
+    if (this.resultsCount < 0) {
+      return this.i18n('results.heading.count.unknown');
+    }
+    if (isNumberFormattingEnabled) {
+      const formattedCount = new Intl.NumberFormat().format(this.resultsCount);
+      return this.i18n('results.heading.count', formattedCount);
+    }
+    return this.i18n('results.heading.count', this.resultsCount);
   },
 
   _sortOptions() {
diff --git a/elements/nuxeo-selection/nuxeo-selection-toolbar.js b/elements/nuxeo-selection/nuxeo-selection-toolbar.js
index f941faeecc..c686f2b58a 100644
--- a/elements/nuxeo-selection/nuxeo-selection-toolbar.js
+++ b/elements/nuxeo-selection/nuxeo-selection-toolbar.js
@@ -112,7 +112,7 @@ Polymer({
             <span class="count" aria-live="polite">
               [[i18n('selectionToolbar.selected.items', selectedItems.length)]]
             </span>
-            <a class="selectionLink" on-tap="toogleSelectedItemsPopup" href="javascript:void(0)">
+            <a class="selectionLink" on-tap="toogleSelectedItemsPopup" href="#">
               <span>[[i18n('selectionToolbar.display.selection')]]</span>
             </a>
           </template>
@@ -121,7 +121,7 @@ Polymer({
           <template is="dom-if" if="[[selectAllActive]]">
             <span class="count" aria-live="polite">[[i18n('selectionToolbar.selected.all', _resultsCount)]]</span>
           </template>
-          <a class="selectionLink" on-tap="clearSelection" href="javascript:void(0)">
+          <a class="selectionLink" on-tap="clearSelection" href="#">
             <span>[[i18n('command.clear')]]</span>
           </a>
         </div>
@@ -188,11 +188,13 @@ Polymer({
     this.hidden = !this.selectedItems || this.selectedItems.length === 0;
   },
 
-  toogleSelectedItemsPopup() {
+  toogleSelectedItemsPopup(e) {
+    e.preventDefault();
     this.$$('#selectedItemsPopup').toggle();
   },
 
-  clearSelection() {
+  clearSelection(e) {
+    e.preventDefault();
     this.fire('clear-selected-items');
   },
 });
diff --git a/elements/workflow/nuxeo-document-task.js b/elements/workflow/nuxeo-document-task.js
index 139fe72f40..28a6e35a20 100644
--- a/elements/workflow/nuxeo-document-task.js
+++ b/elements/workflow/nuxeo-document-task.js
@@ -158,7 +158,7 @@ Polymer({
               </div>
             </template>
           </div>
-          <a href="javascript:undefined" on-tap="_toggleGraphDialog" class="view-graph">[[i18n('tasks.viewGraph')]]</a>
+          <a href="#" on-tap="_toggleGraphDialog" class="view-graph">[[i18n('tasks.viewGraph')]]</a>
           <div class="horizontal spaced">
             <span>[[i18n(tasks.directive)]]</span>
           </div>
@@ -314,7 +314,8 @@ Polymer({
       .finally(() => this._setProcessing(false));
   },
 
-  _toggleGraphDialog() {
+  _toggleGraphDialog(e) {
+    e.preventDefault();
     this.$.graph.show();
   },
 
diff --git a/ftest/features/publication.feature b/ftest/features/publication.feature
index f194f0dacd..c1f7d86e98 100644
--- a/ftest/features/publication.feature
+++ b/ftest/features/publication.feature
@@ -156,4 +156,4 @@ Feature: Internal Publication
     Then I can see the document is a publication
     And I cannot see to publication pill
     And I can unpublish the document
-    And I can see the document has 2 children    
+    And I can see the document has 2 children    
\ No newline at end of file
diff --git a/ftest/pom.xml b/ftest/pom.xml
index 87f9fb2f59..cac5a3b247 100644
--- a/ftest/pom.xml
+++ b/ftest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/index.html b/index.html
index 71e4bd7359..d5847863ac 100644
--- a/index.html
+++ b/index.html
@@ -89,6 +89,10 @@
     <script src="vendor/web-animations/web-animations-next-lite.min.js"></script>
 
     <script nonce="dummy">
+
+      function generateNonce(){
+        return window.crypto.randomUUID().toString('base64')
+      }
       /* eslint-disable no-var, no-unused-vars */
       var Nuxeo = {
         UI: {
@@ -128,6 +132,7 @@
                 hrefBase: 'elements/search/',
               },
             },
+            nonce: generateNonce()
             /* analytics: {
               documentDistribution: {
                 disableThreshold: 100, // uncomment to set the threshold value that disables the distribution analytics
diff --git a/package.json b/package.json
index 84e91f4965..103c294cb9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "repository": "nuxeo/nuxeo-web-ui.git",
   "homepage": "http://www.nuxeo.com",
   "name": "@nuxeo/nuxeo-web-ui",
-  "version": "3.1.14-SNAPSHOT",
+  "version": "3.1.16-SNAPSHOT",
   "license": "Apache-2.0",
   "vendor": "Nuxeo",
   "engines": {
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@nuxeo/nuxeo-web-ui-ftest": "file:./packages/nuxeo-web-ui-ftest",
-    "@nuxeo/testing-helpers": "~3.1.14-rc",
+    "@nuxeo/testing-helpers": "~3.1.16-rc",
     "@open-wc/eslint-config": "^0.3.0",
     "@open-wc/karma-esm": "^2.13.21",
     "@open-wc/prettier-config": "^0.1.0",
@@ -109,9 +109,9 @@
     "@material/mwc-snackbar": "^0.26.1",
     "@nuxeo/chart-elements": "^4.0.0-nx.1",
     "@nuxeo/moment": "^2.24.0-nx.0",
-    "@nuxeo/nuxeo-dataviz-elements": "~3.1.14-rc",
-    "@nuxeo/nuxeo-elements": "~3.1.14-rc",
-    "@nuxeo/nuxeo-ui-elements": "~3.1.14-rc",
+    "@nuxeo/nuxeo-dataviz-elements": "~3.1.16-rc",
+    "@nuxeo/nuxeo-elements": "~3.1.16-rc",
+    "@nuxeo/nuxeo-ui-elements": "~3.1.16-rc",
     "@nuxeo/page": "^1.11.4-nx.0",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/iron-a11y-announcer": "^3.2.0",
diff --git a/packages/nuxeo-web-ui-ftest/features/step_definitions/browser.js b/packages/nuxeo-web-ui-ftest/features/step_definitions/browser.js
index 2a7c06a268..9e2ea8516b 100644
--- a/packages/nuxeo-web-ui-ftest/features/step_definitions/browser.js
+++ b/packages/nuxeo-web-ui-ftest/features/step_definitions/browser.js
@@ -252,7 +252,7 @@ Then(/^I can perform the following publications$/, async function(table) {
       check = override ? newCount === 1 : newCount > pubCount;
     }
     if (check) {
-      pubCount = page.publicationsCount;
+      pubCount = await page.publicationsCount;
     }
   }
 });
diff --git a/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js b/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js
index d4e3e6bfbe..3ebd75fe2e 100644
--- a/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js
+++ b/packages/nuxeo-web-ui-ftest/features/step_definitions/search.js
@@ -199,11 +199,14 @@ Then('I edit the results columns to show {string}', async function(heading) {
 });
 
 Then(/^I save my search as "(.+)"$/, async function(searchName) {
-  const saveAsButton = await this.ui.searchResults.saveSearchAsButton;
+  const searchResults = await this.ui.searchResults;
+  const saveAsButton = await searchResults.saveSearchAsButton;
   await saveAsButton.waitForVisible();
   await saveAsButton.click();
-  await this.ui.searchResults.enterInput(searchName);
-  const confirmSaveButton = await this.ui.searchResults.confirmSaveSearchButton;
+  await driver.pause(2000);
+  await searchResults.enterInput(searchName);
+  await driver.pause(2000);
+  const confirmSaveButton = await searchResults.confirmSaveSearchButton;
   await confirmSaveButton.click();
 });
 
diff --git a/packages/nuxeo-web-ui-ftest/package.json b/packages/nuxeo-web-ui-ftest/package.json
index 9b49e4a98d..3df0e4151a 100644
--- a/packages/nuxeo-web-ui-ftest/package.json
+++ b/packages/nuxeo-web-ui-ftest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxeo/nuxeo-web-ui-ftest",
-  "version": "3.1.14-SNAPSHOT",
+  "version": "3.1.16-SNAPSHOT",
   "bin": {
     "nuxeo-web-ui-ftest": "./bin/nuxeo-web-ui-ftest.js"
   },
diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/admin/cloudServices.js b/packages/nuxeo-web-ui-ftest/pages/ui/admin/cloudServices.js
index ba7009a7f1..2addb733f2 100644
--- a/packages/nuxeo-web-ui-ftest/pages/ui/admin/cloudServices.js
+++ b/packages/nuxeo-web-ui-ftest/pages/ui/admin/cloudServices.js
@@ -157,6 +157,8 @@ export default class CloudServices extends BasePage {
   }
 
   async deleteClient(clientId) {
+    const dataTable = await driver.$('nuxeo-data-table nuxeo-data-table-row [name="id"]');
+    await dataTable.waitForVisible();
     const rows = await browser.$$('nuxeo-data-table[name="table"] nuxeo-data-table-row:not([header])');
     const deleted = await browser
       .$$('nuxeo-data-table[name="table"] nuxeo-data-table-row:not([header])')
diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_page.js b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_page.js
index 253d823e37..c8a498d228 100644
--- a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_page.js
+++ b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_page.js
@@ -88,13 +88,8 @@ export default class DocumentPage extends BasePage {
           }
         }
         if (pub) {
-          return parseInt(
-            pub
-              .$('div')
-              .getText()
-              .trim(),
-            10,
-          );
+          const pubText = await pub.$('div').getText();
+          return parseInt(pubText.trim(), 10);
         }
       }
       return 0;
diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_publications.js b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_publications.js
index c57780bb43..9c6c0e42e8 100644
--- a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_publications.js
+++ b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_publications.js
@@ -31,7 +31,8 @@ export default class DocumentPublications extends BasePage {
     let index;
     for (let i = 0; i < rows.length; i++) {
       const row = rows[i];
-      if (row.isVisible('nuxeo-data-table-cell a.path')) {
+      const isRowVisible = await row.isVisible('nuxeo-data-table-cell a.path');
+      if (isRowVisible) {
         const foundPathEle = await row.$('nuxeo-data-table-cell a.path');
         const foundPath = await foundPathEle.getText();
         const foundPathLowerCase = await foundPath.trim().toLowerCase();
diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_versions.js b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_versions.js
index 342ddcbc91..66b6ec50ad 100644
--- a/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_versions.js
+++ b/packages/nuxeo-web-ui-ftest/pages/ui/browser/document_versions.js
@@ -95,7 +95,8 @@ export default class DocumentVersions extends BasePage {
       return true;
     }
     const listItems = await this.listItems;
-    await listItems.$('div[name="version-item"] .title').waitForVisible();
+    const versionItem = await listItems.$('div[name="version-item"] .title');
+    await versionItem.waitForVisible();
     const listItems1 = await this.listItems.$$('div[name="version-item"]');
     const itemsTitle = await browser.$$('div[name="version-item"]').map((img) => img.$('.title').getText());
     const index = itemsTitle.findIndex((currenTitle) => currenTitle === label);
diff --git a/packages/nuxeo-web-ui-ftest/pages/ui/search.js b/packages/nuxeo-web-ui-ftest/pages/ui/search.js
index 02abf24cad..212dbfce04 100644
--- a/packages/nuxeo-web-ui-ftest/pages/ui/search.js
+++ b/packages/nuxeo-web-ui-ftest/pages/ui/search.js
@@ -66,8 +66,9 @@ export default class Search extends Results {
     return dropdownElenent;
   }
 
-  enterInput(text) {
-    return driver.keys(text);
+  async enterInput(text) {
+    const isInputEntered = await driver.keys(text);
+    return isInputEntered;
   }
 
   async getField(field) {
diff --git a/packages/nuxeo-web-ui-ftest/wdio.conf.js b/packages/nuxeo-web-ui-ftest/wdio.conf.js
index bb50e5ed11..269288e3e3 100644
--- a/packages/nuxeo-web-ui-ftest/wdio.conf.js
+++ b/packages/nuxeo-web-ui-ftest/wdio.conf.js
@@ -27,7 +27,7 @@ const capability = {
   maxInstances: 1,
   browserName: process.env.BROWSER,
   acceptInsecureCerts: true,
-  browserVersion: 'stable',
+  browserVersion: '130.0.6723.116',
 };
 
 const options = {};
diff --git a/plugin/a11y/pom.xml b/plugin/a11y/pom.xml
index 60d8b86a96..bf651c98cb 100644
--- a/plugin/a11y/pom.xml
+++ b/plugin/a11y/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugin/a11y/wdio.conf.js b/plugin/a11y/wdio.conf.js
index 32ac676978..5d37d734e3 100644
--- a/plugin/a11y/wdio.conf.js
+++ b/plugin/a11y/wdio.conf.js
@@ -28,7 +28,6 @@ const capability = {
 };
 const options = {
   args: ['--no-sandbox'],
-  w3c: false,
 };
 if (process.env.HEADLESS) {
   options.args.push('--window-size=1920,1080');
diff --git a/plugin/itests/addon/pom.xml b/plugin/itests/addon/pom.xml
index 60dbc9eac9..bb32d3a83e 100644
--- a/plugin/itests/addon/pom.xml
+++ b/plugin/itests/addon/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugin/itests/marketplace/pom.xml b/plugin/itests/marketplace/pom.xml
index 886e06635f..666e58f9d4 100644
--- a/plugin/itests/marketplace/pom.xml
+++ b/plugin/itests/marketplace/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugin/metrics/pom.xml b/plugin/metrics/pom.xml
index 6564d544ba..e51d682457 100644
--- a/plugin/metrics/pom.xml
+++ b/plugin/metrics/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugin/web-ui/addon/pom.xml b/plugin/web-ui/addon/pom.xml
index 79512fd8e4..689387ac7b 100644
--- a/plugin/web-ui/addon/pom.xml
+++ b/plugin/web-ui/addon/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml b/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml
index 792dc7fc3f..58685a15c0 100644
--- a/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml
+++ b/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml
@@ -56,5 +56,8 @@
     <!-- allowed url to redirect -->
    <property name="org.nuxeo.web.ui.trustedDomains">${org.nuxeo.web.ui.trustedDomains:=}</property>
 
+   <!-- Search result numberFormatting -->
+  <property name="org.nuxeo.web.ui.numberFormatting.enabled">${org.nuxeo.web.ui.numberFormatting.enabled:=}</property>
+
   </extension>
 </component>
\ No newline at end of file
diff --git a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/config.jsp b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/config.jsp
index 2c870d003f..fe7394d7a8 100644
--- a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/config.jsp
+++ b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/config.jsp
@@ -29,6 +29,7 @@
 var Nuxeo = Nuxeo || {};
 Nuxeo.UI = Nuxeo.UI || {};
 Nuxeo.UI.config = <%= cs.getPropertiesAsJson("org.nuxeo.web.ui") %>;
+Nuxeo.UI.config.nonce = NuxeoNonce;
 Nuxeo.UI.bundles = [
   <% for (Resource resource : wrm.getResources(new ResourceContextImpl(), "web-ui", "import")) { %>
   '<%= context %><%= resource.getURI() %>',
diff --git a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp
index 8b7231a259..daa86a7c81 100644
--- a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp
+++ b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp
@@ -17,10 +17,13 @@ limitations under the License.
 -->
 <%@ page trimDirectiveWhitespaces="true" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page import="java.util.UUID"%>
 <%@ page import="org.nuxeo.common.Environment"%>
 <%@ page import="org.nuxeo.runtime.api.Framework"%>
 <%@ page import="org.nuxeo.ecm.core.api.repository.RepositoryManager"%>
 <%@ page import="org.nuxeo.common.utils.UserAgentMatcher"%>
+<%@ page import="javax.servlet.http.HttpServletResponse" %>
+
 
 <%
   String ua = request.getHeader("user-agent");
@@ -35,6 +38,42 @@ limitations under the License.
   } else {
     baseUrl = context + "/repo/" + repository + "/ui/";
   }
+  HttpServletResponse resp = (HttpServletResponse) pageContext.getResponse();
+  String NX_NONCE_VALUE = UUID.randomUUID().toString();
+  String updatedScriptSrcStr = "'self' 'strict-dynamic' 'nonce-" + NX_NONCE_VALUE + "'";
+  String cspHeader = resp.getHeader("Content-Security-Policy");
+  String newCspHeader = "";
+  boolean isExistingCspHeaderEmpty = false;
+  if(cspHeader == null || cspHeader.trim().isEmpty()) { 
+    isExistingCspHeaderEmpty = true;
+    cspHeader = "";
+   }
+  String scriptSrc = "";
+  String directive = null;
+  String[] directives = cspHeader.split(";");
+  boolean foundScriptSrcMatch = false;
+  boolean foundObjectSrcMatch = false;
+  for (int i = 0; i < directives.length; i++) {
+    directive = directives[i].trim();
+    if (directive.startsWith("script-src ")) {
+        foundScriptSrcMatch = true;
+        directive = directive.trim() + " " + updatedScriptSrcStr;
+        directives[i] = directive;
+    }
+    if (directive.startsWith("object-src ")) {
+      foundObjectSrcMatch = true;
+    }
+  }
+  if(foundScriptSrcMatch) {
+    newCspHeader =  String.join(";", directives);
+  }
+  else {
+    newCspHeader = cspHeader.trim() + (isExistingCspHeaderEmpty ? " script-src " : "; script-src ") + updatedScriptSrcStr;
+  }
+  if(!foundObjectSrcMatch){
+    newCspHeader = newCspHeader.trim() + "; object-src  'none'";
+  }
+  resp.setHeader("Content-Security-Policy", newCspHeader);
 %>
 
 <!DOCTYPE html>
@@ -83,6 +122,10 @@ limitations under the License.
   </style>
 </head>
 
+<script nonce="<%= NX_NONCE_VALUE %>">
+  const NuxeoNonce = "<%= NX_NONCE_VALUE %>";
+</script>
+
 <body>
   <nuxeo-connection url="<%= context %>" repository-name="<%= repository %>"></nuxeo-connection>
   <nuxeo-app base-url="<%= baseUrl %>"
@@ -97,15 +140,15 @@ limitations under the License.
     </div>
   </nuxeo-app>
 
-  <script src="vendor/webcomponentsjs/webcomponents-loader.js"></script>
+  <script src="vendor/webcomponentsjs/webcomponents-loader.js"  nonce="<%= NX_NONCE_VALUE %>"></script>
 
-  <script src="vendor/html-imports/html-imports.min.js"></script>
+  <script src="vendor/html-imports/html-imports.min.js" nonce="<%= NX_NONCE_VALUE %>"></script>
 
-  <script src="vendor/web-animations/web-animations-next-lite.min.js"></script>
+  <script src="vendor/web-animations/web-animations-next-lite.min.js"  nonce="<%= NX_NONCE_VALUE %>"></script>
 
-  <script src="config.jsp"></script>
+  <script src="config.jsp"  nonce="<%= NX_NONCE_VALUE %>"></script>
 
-  <script src="main.bundle.js"></script>
+  <script src="main.bundle.js"  nonce="<%= NX_NONCE_VALUE %>"></script>
 
 </body>
 
diff --git a/plugin/web-ui/marketplace/pom.xml b/plugin/web-ui/marketplace/pom.xml
index 30b4bacd13..3caea6a4e6 100644
--- a/plugin/web-ui/marketplace/pom.xml
+++ b/plugin/web-ui/marketplace/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.web.ui</groupId>
     <artifactId>nuxeo-web-ui-parent</artifactId>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.16-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/plugin/web-ui/marketplace/src/main/resources/package.xml b/plugin/web-ui/marketplace/src/main/resources/package.xml
index 33d64b5a85..dbca0dfec9 100644
--- a/plugin/web-ui/marketplace/src/main/resources/package.xml
+++ b/plugin/web-ui/marketplace/src/main/resources/package.xml
@@ -13,7 +13,7 @@
   <supported>true</supported>
   <target-platform>
     <name>@DISTRIBUTION_NAME@</name>
-    <version>[2023.0,)</version>
+    <version>[2023.0,2025)</version>
   </target-platform>
   <license>Apache License, Version 2.0</license>
   <license-url>http://www.apache.org/licenses/LICENSE-2.0.html</license-url>
diff --git a/pom.xml b/pom.xml
index 0721eaa0f3..cc50f6f400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <packaging>pom</packaging>
   <name>Nuxeo Web UI - Parent</name>
   <description>Nuxeo Web UI - Parent</description>
-  <version>3.1.14-SNAPSHOT</version>
+  <version>3.1.16-SNAPSHOT</version>
 
   <properties>
     <nuxeo.target.version>2023.*</nuxeo.target.version>