diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 598e540198d..b7bcaf6757c 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -59,31 +59,3 @@ jobs:
         github_actor: ${{ secrets.LNB_ACTOR }}
         github_token: ${{ secrets.LNB_TOKEN }}
 
-  ln-builds:
-    needs: build
-    runs-on: ubuntu-20.04
-    if: github.repository == 'hpcc-systems/HPCC-Platform'
-    steps:
-    - name: Free additional disk space (remove Android SDK + Tools)
-      run: |
-        sudo rm -rf /usr/local/lib/android
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Build
-      uses: ./dockerfiles
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        ln_username: ${{ secrets.JFROG_USERNAME }}
-        ln_password: ${{ secrets.JFROG_PASSWORD }}
-        ln_registry: ${{ secrets.JFROG_REGISTRY }}
-        ln_docker_repo: ${{ secrets.JFROG_REPOSITORY }}
-        lnb_token: ${{ secrets.LNB_TOKEN }}
-        latest: 1   # this should only be set on the current minor branch
-        build_ln: 1
-        github_actor: ${{ secrets.LNB_ACTOR }}
-        github_token: ${{ secrets.LNB_TOKEN }}
-        sign_modules: 1
-        signing_secret: ${{ secrets.SIGNING_SECRET }}
-        signing_keyid: ${{ secrets.SIGNING_KEYID }}
-        signing_passphrase: ${{ secrets.SIGNING_PASSPHRASE }}
diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
index 94c6a6c9e94..682bf16aac3 100644
--- a/esp/src/package-lock.json
+++ b/esp/src/package-lock.json
@@ -14,21 +14,21 @@
         "@fluentui/react-experiments": "8.14.95",
         "@fluentui/react-hooks": "8.6.29",
         "@fluentui/react-icons-mdl2": "1.3.47",
-        "@hpcc-js/chart": "2.81.6",
-        "@hpcc-js/codemirror": "2.60.11",
-        "@hpcc-js/common": "2.71.11",
-        "@hpcc-js/comms": "2.84.3",
+        "@hpcc-js/chart": "2.81.7",
+        "@hpcc-js/codemirror": "2.60.12",
+        "@hpcc-js/common": "2.71.12",
+        "@hpcc-js/comms": "2.84.4",
         "@hpcc-js/dataflow": "8.1.6",
-        "@hpcc-js/eclwatch": "2.73.26",
-        "@hpcc-js/graph": "2.85.7",
-        "@hpcc-js/html": "2.42.12",
-        "@hpcc-js/layout": "2.49.11",
-        "@hpcc-js/map": "2.77.10",
-        "@hpcc-js/other": "2.15.11",
-        "@hpcc-js/phosphor": "2.16.11",
-        "@hpcc-js/react": "2.53.8",
-        "@hpcc-js/tree": "2.40.11",
-        "@hpcc-js/util": "2.50.5",
+        "@hpcc-js/eclwatch": "2.73.27",
+        "@hpcc-js/graph": "2.85.8",
+        "@hpcc-js/html": "2.42.13",
+        "@hpcc-js/layout": "2.49.12",
+        "@hpcc-js/map": "2.77.11",
+        "@hpcc-js/other": "2.15.12",
+        "@hpcc-js/phosphor": "2.16.12",
+        "@hpcc-js/react": "2.53.9",
+        "@hpcc-js/tree": "2.40.12",
+        "@hpcc-js/util": "2.50.6",
         "@kubernetes/client-node": "0.18.1",
         "clipboard": "2.0.11",
         "d3-dsv": "3.0.1",
@@ -152,6 +152,14 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/@fastify/busboy": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz",
+      "integrity": "sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@floating-ui/core": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.3.1.tgz",
@@ -1520,67 +1528,67 @@
       }
     },
     "node_modules/@hpcc-js/api": {
-      "version": "2.12.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.12.11.tgz",
-      "integrity": "sha512-Y2qisKnaMCwmqnKSGNF7yrzGcqP7ZMiNnWh2SrP1RkTkYskUcICEKgx0TUg9LgK58irfGGi4Y1bSiJgLNbC4eA==",
+      "version": "2.12.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/api/-/api-2.12.12.tgz",
+      "integrity": "sha512-2IFnpSZgS4Fuq4uJWBK7rdWlNBpYK5Tjy+5mjntwzC2zcJLzOl3GGvUfLdW3+so5xzu2PpvpTQxpeqQkkpEIXA==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11"
+        "@hpcc-js/common": "^2.71.12"
       }
     },
     "node_modules/@hpcc-js/chart": {
-      "version": "2.81.6",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.81.6.tgz",
-      "integrity": "sha512-UpefYA3lp+oCeHjz7QiHlkSDeDdh0FfuikbSZAzcCDOuSNEiLfvyFlOaqM9Bdgq/rfiuXvVbiZRgu0CmkVtaQQ==",
+      "version": "2.81.7",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/chart/-/chart-2.81.7.tgz",
+      "integrity": "sha512-blJb1RLwxSbz2OU8tYra81y7dgvcNjYBk8UZkxdjZuL3S5lpuUFjt+4JIk4zzT/E92IXcy0laYOEU7pt7pLQGA==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/codemirror": {
-      "version": "2.60.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.60.11.tgz",
-      "integrity": "sha512-uaPj3bWS/j8nLm9/naz572G3DrJCfA3jfk3m7iwuEeK0fy7tOhYFqkipjxFKVnE3vRzMTN9s8MA1sNDZVVOoYA==",
+      "version": "2.60.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.60.12.tgz",
+      "integrity": "sha512-/GPDLlmvSp5ehIC5X5NMZBPVMNZ5WNEPvagFHlxdvKPZzPwI8rmc+0PuCekcueqGm1VdT7arE9PRtRRl/UctnA==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11"
+        "@hpcc-js/common": "^2.71.12"
       }
     },
     "node_modules/@hpcc-js/common": {
-      "version": "2.71.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.71.11.tgz",
-      "integrity": "sha512-Z3gtybbLMNOgge4yiG4pUfkY29kHxA//H99dwanNeCvujzpXaJnmnoTpLdZnSj3C/cjQUxsgQGFO4xI0qvzvpQ==",
-      "dependencies": {
-        "@hpcc-js/util": "^2.50.5",
-        "@types/d3-array": "1.2.9",
-        "@types/d3-brush": "1.1.5",
-        "@types/d3-collection": "1.0.10",
-        "@types/d3-color": "1.4.2",
-        "@types/d3-dispatch": "1.0.9",
-        "@types/d3-drag": "1.2.5",
-        "@types/d3-dsv": "1.2.2",
+      "version": "2.71.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/common/-/common-2.71.12.tgz",
+      "integrity": "sha512-mYK0riwC+vHP3VFp8i9yDQhQytGujbkDcS/LotXtbY8zIu+Um7AgxOaM7eZZlUw1/WrX6ko6ljSK6Q1x5SxtGw==",
+      "dependencies": {
+        "@hpcc-js/util": "^2.50.6",
+        "@types/d3-array": "1.2.10",
+        "@types/d3-brush": "1.1.6",
+        "@types/d3-collection": "1.0.11",
+        "@types/d3-color": "1.4.3",
+        "@types/d3-dispatch": "1.0.10",
+        "@types/d3-drag": "1.2.6",
+        "@types/d3-dsv": "1.2.5",
         "@types/d3-ease": "1.0.11",
-        "@types/d3-format": "1.4.2",
-        "@types/d3-interpolate": "1.4.2",
-        "@types/d3-scale": "1.0.18",
-        "@types/d3-selection": "1.4.3",
-        "@types/d3-time-format": "2.3.1",
-        "@types/d3-transition": "1.3.2",
-        "@types/d3-zoom": "1.8.4"
+        "@types/d3-format": "1.4.3",
+        "@types/d3-interpolate": "1.4.3",
+        "@types/d3-scale": "1.0.19",
+        "@types/d3-selection": "1.4.4",
+        "@types/d3-time-format": "2.3.2",
+        "@types/d3-transition": "1.3.3",
+        "@types/d3-zoom": "1.8.5"
       }
     },
     "node_modules/@hpcc-js/comms": {
-      "version": "2.84.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.84.3.tgz",
-      "integrity": "sha512-PL1K9fdxN++UtX1UPMW4Jn5JO1IefxHX08lJcCZ7ekuHp3+brrokj2luBQ3Z8uQPXEEXKSdwYoP7pTyX5pyrtg==",
+      "version": "2.84.4",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.84.4.tgz",
+      "integrity": "sha512-GkKUyttPRYPb/jluoNtxY6jEqJhF2Dr0srzXrF+Vs0biyr4GvwQzMcoQfU97PQl7PJx8M+FUquMchfuQ7sqSWA==",
       "dependencies": {
-        "@hpcc-js/ddl-shim": "^2.20.5",
-        "@hpcc-js/util": "^2.50.5",
-        "@xmldom/xmldom": "0.8.8",
+        "@hpcc-js/ddl-shim": "^2.20.6",
+        "@hpcc-js/util": "^2.50.6",
+        "@xmldom/xmldom": "0.8.10",
         "abort-controller": "3.0.0",
         "node-fetch": "2.7.0",
         "safe-buffer": "5.2.1",
         "tmp": "0.2.1",
-        "undici": "5.24.0"
+        "undici": "5.26.3"
       }
     },
     "node_modules/@hpcc-js/comms/node_modules/safe-buffer": {
@@ -1608,9 +1616,9 @@
       "integrity": "sha512-BMmpA6CP00nRDdeq7MS/LRN+e08dyBnnLWEITK5zuEn8D9sFo4ZJlmrKNp+Lcox/m+CuNqWMTG9Z5c+hK2jUyw=="
     },
     "node_modules/@hpcc-js/ddl-shim": {
-      "version": "2.20.5",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.20.5.tgz",
-      "integrity": "sha512-TgUzwlzRCS0Tl1Nc8FQ185mbAE11/ExRFAYtkYjqN0Lf45PwDoRoIoPQlqSnIis2Br7SNVmZPAO75poWpf0qLg==",
+      "version": "2.20.6",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/ddl-shim/-/ddl-shim-2.20.6.tgz",
+      "integrity": "sha512-0N9KwRr2rzSJEhfXjEDmT2IBf2Bm6QJ4ReOzhu1wTN3O3gKkUXxNxJMDePFyCNaeHaNWGEQOxewf1q9NtrSkbA==",
       "hasInstallScript": true,
       "dependencies": {
         "ajv": "6.12.6"
@@ -1620,123 +1628,123 @@
       }
     },
     "node_modules/@hpcc-js/dgrid": {
-      "version": "2.32.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.32.12.tgz",
-      "integrity": "sha512-A6S1YD2bkMmGLQ/gFJG0hBXn9fMXUE10SejQq/7In3NpHm3vOBwD2Pv0Ak7/md6TRjmH1nN8nT0PjK2wERY4Pg==",
+      "version": "2.32.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid/-/dgrid-2.32.13.tgz",
+      "integrity": "sha512-N6HtJy1uh3tUicHvbqbY2PHk1uqmWM5JSkztzx6AhzqA+Cm5OZIAIXl56QNHhvDZw+1y4QKpu8dxiVLjCe4C0g==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/ddl-shim": "^2.20.5",
-        "@hpcc-js/dgrid-shim": "^2.24.6",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/ddl-shim": "^2.20.6",
+        "@hpcc-js/dgrid-shim": "^2.24.7",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/dgrid-shim": {
-      "version": "2.24.6",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid-shim/-/dgrid-shim-2.24.6.tgz",
-      "integrity": "sha512-WiY1nH6QJPftxEEpWXQIn5uGxcx/8MAgfLbGOQt374DlSpIkyBLskX0iPw8+lS5UGLEh53PiirPkdRkCLRTCBQ=="
+      "version": "2.24.7",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid-shim/-/dgrid-shim-2.24.7.tgz",
+      "integrity": "sha512-Cras6gFjG957Qe+mbd+p3ZXJZ4wdHCy93sriwVWroq2ZvwLINJ0LQelmp4NA9ctr99pp9WXsI8GsmoQHhQeYIw=="
     },
     "node_modules/@hpcc-js/dgrid2": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid2/-/dgrid2-2.3.11.tgz",
-      "integrity": "sha512-UvNambdiVy8OQ2U4nNl2QKjUjEKI2FVFc5QX4qD5XaTXCPUPEGYH0CHlNoGfOKL/hDQxUgsxLxsF9iBuVYP7IQ==",
+      "version": "2.3.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/dgrid2/-/dgrid2-2.3.12.tgz",
+      "integrity": "sha512-uasaW9CuCXnaEijBuPTopdPJyE0+/uBxyz+DXlH82yWQHZzHJfI6pZGpkXIG4dr1vvvEPT8eAIyVFW5zkbo4/g==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/preact-shim": "^2.16.6",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/preact-shim": "^2.16.7",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/eclwatch": {
-      "version": "2.73.26",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.73.26.tgz",
-      "integrity": "sha512-h2bW8tb+byebxotQetk6wiJ0Aj6tuHpQrHp/BUk7mvQbR0lJEPXSZ5cIQgIaysDXzdUrfMA6sh10crbR/9t5Kw==",
-      "dependencies": {
-        "@hpcc-js/codemirror": "^2.60.11",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/comms": "^2.84.3",
-        "@hpcc-js/dgrid": "^2.32.12",
-        "@hpcc-js/graph": "^2.85.7",
-        "@hpcc-js/layout": "^2.49.11",
-        "@hpcc-js/phosphor": "^2.16.11",
-        "@hpcc-js/timeline": "^2.51.14",
-        "@hpcc-js/tree": "^2.40.11",
-        "@hpcc-js/util": "^2.50.5"
+      "version": "2.73.27",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/eclwatch/-/eclwatch-2.73.27.tgz",
+      "integrity": "sha512-0wry0JKkFxVXjP5OTFHbBqtwdnr60Rb5XQVId1kgNisLwTJq71tmyVz6ViBZ9qoMiQsZxtS8px4EJTguDOj4aA==",
+      "dependencies": {
+        "@hpcc-js/codemirror": "^2.60.12",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/comms": "^2.84.4",
+        "@hpcc-js/dgrid": "^2.32.13",
+        "@hpcc-js/graph": "^2.85.8",
+        "@hpcc-js/layout": "^2.49.12",
+        "@hpcc-js/phosphor": "^2.16.12",
+        "@hpcc-js/timeline": "^2.51.15",
+        "@hpcc-js/tree": "^2.40.12",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/graph": {
-      "version": "2.85.7",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.85.7.tgz",
-      "integrity": "sha512-osewnAm3nauQQUK0rbXAZ2hMmqGAmucfZzNIuiqqvx10DyU+XC+t1aRWDrUrZ8gRRFW0ObYetI8fv2/35twadw==",
+      "version": "2.85.8",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/graph/-/graph-2.85.8.tgz",
+      "integrity": "sha512-mlAfAzPAyY6s/jP0Yizdk2QMoeup4gHpXGpSK9NRa4JWcevr6Pobw2RUuDpQgAqz+B8XXwloVxZhRryyQgrIBA==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/html": "^2.42.12",
-        "@hpcc-js/react": "^2.53.8",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/html": "^2.42.13",
+        "@hpcc-js/react": "^2.53.9",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/html": {
-      "version": "2.42.12",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.42.12.tgz",
-      "integrity": "sha512-Myu3CI7c/ESazZ70ZJTMxtpwJAOHgTmTr7h94uXM4J9uKhGxMVDIIDM7frvOskhDoD4vy+Mc+BrPCnfJsXdd7Q==",
+      "version": "2.42.13",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/html/-/html-2.42.13.tgz",
+      "integrity": "sha512-PwmSsDXaBS6eqSeoO5135aKJeUPSwnaJkMwDbcr3Wh9VXxx6sDyEp7PfYF9tBbkoeZL8JvYxZu12Trs8eUt/eA==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/preact-shim": "^2.16.6",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/preact-shim": "^2.16.7",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/layout": {
-      "version": "2.49.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.49.11.tgz",
-      "integrity": "sha512-L+UzIaRQdI4gj5zVpyOjvD8V4TGZ7Afr5GccpNbazUyjwyIDYBEObwFkDYHOd3anfAx/xFzf/S3vgoiXe5JfoQ==",
+      "version": "2.49.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/layout/-/layout-2.49.12.tgz",
+      "integrity": "sha512-ZpUWWA7JYEK8ucqMBibP3ZrKFJXzLtb7PbNgavNOkE7C+uh0P5h0sNXcrHIEwjNNrw06tes7W1lEJUr9cBruJA==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/chart": "^2.81.6",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/dgrid2": "^2.3.11"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/chart": "^2.81.7",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/dgrid2": "^2.3.12"
       }
     },
     "node_modules/@hpcc-js/leaflet-shim": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/leaflet-shim/-/leaflet-shim-2.3.3.tgz",
-      "integrity": "sha512-Nub1qRuFWKz1xc8LFf453r7yP8jium0tolTYrVwFdj4Rc8oKsDh8xC2iTRJu/L79JZsCRlPU1GxZKomSnNEbMg==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/leaflet-shim/-/leaflet-shim-2.3.4.tgz",
+      "integrity": "sha512-kxIoQpd7p2WoxGia4/3Xfs/H9SS9SrEZ2aIVWRdgyvVfmBVcEWRKw4iJhVUo94MrJcNCJXBl5+ZqUquZV7q2uA==",
       "dependencies": {
-        "@types/leaflet": "1.9.3",
+        "@types/leaflet": "1.9.6",
         "leaflet": "1.9.4"
       }
     },
     "node_modules/@hpcc-js/map": {
-      "version": "2.77.10",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.77.10.tgz",
-      "integrity": "sha512-pghIGSMAJwy01xpfN9geTUUy0E6/KJeUUOt7YVn4D0D1OkHQJLr9nxwSz1tID76F0psUnRKiY7mfDUvhhZUbSA==",
+      "version": "2.77.11",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/map/-/map-2.77.11.tgz",
+      "integrity": "sha512-PzilbSsb7DLupxtXMSgnHXMsJNgaRs89lxor0f0n9lINJ+1GO44v1NR12ctJAPgso+f4BGQB5yA4zmw74do+tQ==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/graph": "^2.85.7",
-        "@hpcc-js/layout": "^2.49.11",
-        "@hpcc-js/leaflet-shim": "^2.3.3",
-        "@hpcc-js/other": "^2.15.11",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/graph": "^2.85.8",
+        "@hpcc-js/layout": "^2.49.12",
+        "@hpcc-js/leaflet-shim": "^2.3.4",
+        "@hpcc-js/other": "^2.15.12",
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/other": {
-      "version": "2.15.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.15.11.tgz",
-      "integrity": "sha512-kRuHGmilmhPtzndoe4JFDOjeY7gQv2qDGFEXHoctv9arTvUESggO0C5zH2QO3FvJRhwu1SbXN15q6seeTkaP+A==",
+      "version": "2.15.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/other/-/other-2.15.12.tgz",
+      "integrity": "sha512-a1638W3XsIA05sLs8C/MuDDFvZd1vQEdU6rZK02+aiUprEIniPFG0OekKn6DJRvcEJRNd+vd1SN2ri+lzu27Gg==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/layout": "^2.49.11"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/layout": "^2.49.12"
       }
     },
     "node_modules/@hpcc-js/phosphor": {
-      "version": "2.16.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.16.11.tgz",
-      "integrity": "sha512-AZ3IuBNgt9zoBUUPGR/5l/QBQT6Dbs7LzwB2UfIKri7xP+eYHZpy8b0h4GYBmuUaf6xp3usA2txcxdKvHhkySw==",
+      "version": "2.16.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/phosphor/-/phosphor-2.16.12.tgz",
+      "integrity": "sha512-p6pF97D/fSkHXT3uIIqfQCTZf43a9zkRJ5a+fyS8toCBFcskHNM3OdVEYYXChBieTPz4xx2FJwmrBlXmEZ2quw==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/other": "^2.15.11",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/other": "^2.15.12",
         "@hpcc-js/phosphor-shim": "^2.14.6",
-        "@hpcc-js/util": "^2.50.5"
+        "@hpcc-js/util": "^2.50.6"
       }
     },
     "node_modules/@hpcc-js/phosphor-shim": {
@@ -1751,56 +1759,56 @@
       }
     },
     "node_modules/@hpcc-js/preact-shim": {
-      "version": "2.16.6",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/preact-shim/-/preact-shim-2.16.6.tgz",
-      "integrity": "sha512-lpWJZ4CMSIA08rnhcUMG9ggktZHO89sQPFOvdZMMzwijIkXTTi8snn/JMkiGuzPgQvYuM6K2WTuve79zQl4wQA==",
+      "version": "2.16.7",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/preact-shim/-/preact-shim-2.16.7.tgz",
+      "integrity": "sha512-newPpEKWYjLKPV32j0ledPk0nJaFQOM4IiPibiW6RQONYs7fvTVILbLIUpDv1pZ0QDJubGIhkrn4Pbc+P/vyxA==",
       "dependencies": {
-        "preact": "10.15.1"
+        "preact": "10.18.1"
       }
     },
     "node_modules/@hpcc-js/react": {
-      "version": "2.53.8",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.53.8.tgz",
-      "integrity": "sha512-NuuHR5R/Cf0GvKLDSb7/WKXWKeiu/1wsPIqRxuJKERq4YmZFuK1DNYkWdJskfOFlTIoRzNG5+EwyUqO1lvUPZg==",
+      "version": "2.53.9",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/react/-/react-2.53.9.tgz",
+      "integrity": "sha512-vox6OEHBuaniA/Tn94yXVwZN5HUa6OXMm/6qpeSpgY1ZfPKvhzr9fjTsOfk7mNFnAMvVK69+AJWh/inCBWZM5w==",
       "dependencies": {
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/preact-shim": "^2.16.6"
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/preact-shim": "^2.16.7"
       }
     },
     "node_modules/@hpcc-js/timeline": {
-      "version": "2.51.14",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.51.14.tgz",
-      "integrity": "sha512-uamRb2RABNfNRXNvSDqqp3LtlwJqVS4w/gZY7rrs5jbG28ndFVWHCWEGHZDhNdmDAgG7fDAPQ07UqZxmeKBSWQ==",
+      "version": "2.51.15",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/timeline/-/timeline-2.51.15.tgz",
+      "integrity": "sha512-dtH0UKE/Wmd2IJ7jy40gaYCMMMnxVSFHP4zEgxTV7+IHxxhgWzyGHGpo+zvZnyOqml3RPnIvcMGDfECJ8bmAzQ==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/chart": "^2.81.6",
-        "@hpcc-js/common": "^2.71.11",
-        "@hpcc-js/html": "^2.42.12",
-        "@hpcc-js/layout": "^2.49.11",
-        "@hpcc-js/react": "^2.53.8"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/chart": "^2.81.7",
+        "@hpcc-js/common": "^2.71.12",
+        "@hpcc-js/html": "^2.42.13",
+        "@hpcc-js/layout": "^2.49.12",
+        "@hpcc-js/react": "^2.53.9"
       }
     },
     "node_modules/@hpcc-js/tree": {
-      "version": "2.40.11",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.40.11.tgz",
-      "integrity": "sha512-obcT5PZpIe7rJYryIdsZb19ZfApsTRZmD5A08QkBcbyQ8zl1T2dXDj9JZ6rVCZcoBFjjegdS4Vr7EN9eu93XJw==",
+      "version": "2.40.12",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/tree/-/tree-2.40.12.tgz",
+      "integrity": "sha512-ZqhVUAYKKjylbM5Ue8okWNTYZaS5J3hnXhAN0/HcaRoAVCSEH1Ikef61xHvWHqSLQqDgNi+nWuSjbyRuY/b5Kw==",
       "dependencies": {
-        "@hpcc-js/api": "^2.12.11",
-        "@hpcc-js/common": "^2.71.11"
+        "@hpcc-js/api": "^2.12.12",
+        "@hpcc-js/common": "^2.71.12"
       }
     },
     "node_modules/@hpcc-js/util": {
-      "version": "2.50.5",
-      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.50.5.tgz",
-      "integrity": "sha512-TbEhzAuirvyhP2eleFuPuh4mgmK9YG1gLtAQJudr2bN0Q+3hZpepIkEq3kI8UHZ7F+nIBrVWbCYmA6/BrYKCbw==",
+      "version": "2.50.6",
+      "resolved": "https://registry.npmjs.org/@hpcc-js/util/-/util-2.50.6.tgz",
+      "integrity": "sha512-k4yDXdYX5h2RcccVy9sW1djcOP1w6G/GYAAs7duEPbx0TyvpMuK/Bo/gKW6Wq89Ce46moOtEq+7WyOqvLXsQgg==",
       "dependencies": {
-        "tslib": "2.4.1"
+        "tslib": "2.6.2"
       }
     },
     "node_modules/@hpcc-js/util/node_modules/tslib": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.10",
@@ -2115,45 +2123,45 @@
       "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="
     },
     "node_modules/@types/d3-array": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-1.2.9.tgz",
-      "integrity": "sha512-E/7RgPr2ylT5dWG0CswMi9NpFcjIEDqLcUSBgNHe/EMahfqYaTx4zhcggG3khqoEB/leY4Vl6nTSbwLUPjXceA=="
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-1.2.10.tgz",
+      "integrity": "sha512-b47UQ8RWEDdWdpxTdeppAZ1pyy64PMiLawItciimtvqBS1+FqUi3tk7iG0UT/6vQKMhuHpsMVVOadj71Q7vUcQ=="
     },
     "node_modules/@types/d3-brush": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-1.1.5.tgz",
-      "integrity": "sha512-4zGkBafJf5zCsBtLtvDj/pNMo5X9+Ii/1hUz0GvQ+wEwelUBm2AbIDAzJnp2hLDFF307o0fhxmmocHclhXC+tw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-brush/-/d3-brush-1.1.6.tgz",
+      "integrity": "sha512-eAqaEzE6zA1JbslrEHvDXMjADV5LyrIfK00YkgmxVKodvrPiw6JxVBseySO3YE3UNIZ/jBplE9NDIlpY7t5pwQ==",
       "dependencies": {
         "@types/d3-selection": "^1"
       }
     },
     "node_modules/@types/d3-collection": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/d3-collection/-/d3-collection-1.0.10.tgz",
-      "integrity": "sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A=="
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@types/d3-collection/-/d3-collection-1.0.11.tgz",
+      "integrity": "sha512-PN9XeRw8FyadFGrmK1f6VDo95sbJ1cKqGy9nyUzdC2xUdYSYmvJGLBcg/DUfS2a1Zh4tTqgE10HebuN/r8qSpw=="
     },
     "node_modules/@types/d3-color": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.2.tgz",
-      "integrity": "sha512-fYtiVLBYy7VQX+Kx7wU/uOIkGQn8aAEY8oWMoyja3N4dLd8Yf6XgSIR/4yWvMuveNOH5VShnqCgRqqh/UNanBA=="
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-1.4.3.tgz",
+      "integrity": "sha512-jcHMwBcuuQ1LPt43jdbOhdOFczfDfhzvAZ1+1L0KiXPv4VqGsWAltxfxUDvtSuIMsvTZ2eeua+tOtxI6qqxYUg=="
     },
     "node_modules/@types/d3-dispatch": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz",
-      "integrity": "sha512-zJ44YgjqALmyps+II7b1mZLhrtfV/FOxw9owT87mrweGWcg+WK5oiJX2M3SYJ0XUAExBduarysfgbR11YxzojQ=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-1.0.10.tgz",
+      "integrity": "sha512-QDjKymeWL+SNmHVlLO7e9/zgR59I1uKC+FockA7EifxfpzmkBnqapzOUGDgi5bt8WBUg10mhTzWAyqruuixSGQ=="
     },
     "node_modules/@types/d3-drag": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-1.2.5.tgz",
-      "integrity": "sha512-7NeTnfolst1Js3Vs7myctBkmJWu6DMI3k597AaHUX98saHjHWJ6vouT83UrpE+xfbSceHV+8A0JgxuwgqgmqWw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-drag/-/d3-drag-1.2.6.tgz",
+      "integrity": "sha512-vG4mVNCKKYee3+C0p/Qk4q0W0zBU4tG9ub1DltjZ2edLK/5SKssu3f1IqzuDSPnAMs5oFYLsI6yd4phUZ1KAlg==",
       "dependencies": {
         "@types/d3-selection": "^1"
       }
     },
     "node_modules/@types/d3-dsv": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-1.2.2.tgz",
-      "integrity": "sha512-GRnz9z8ypqb7OsQ/xw/BmFAp0/k3pgM1s19FTZZSlCMY0EvyVTkU8xzZKKDXzytGXPpTNC4R5pGl9oxEvVSnHQ=="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-dsv/-/d3-dsv-1.2.5.tgz",
+      "integrity": "sha512-ds8/wXUEuLxRubqhr0ksAv7eVBTWiW74rSf4w2BAb+FmaFAKj3j7BFU38Lp9H/uWfrFsTvEAC6c2GfqQgrb/Yw=="
     },
     "node_modules/@types/d3-ease": {
       "version": "1.0.11",
@@ -2161,53 +2169,53 @@
       "integrity": "sha512-wUigPL0kleGZ9u3RhzBP07lxxkMcUjL5IODP42mN/05UNL+JJCDnpEPpFbJiPvLcTeRKGIRpBBJyP/1BNwYsVA=="
     },
     "node_modules/@types/d3-format": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.2.tgz",
-      "integrity": "sha512-WeGCHAs7PHdZYq6lwl/+jsl+Nfc1J2W1kNcMeIMYzQsT6mtBDBgtJ/rcdjZ0k0rVIvqEZqhhuD5TK/v3P2gFHQ=="
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-format/-/d3-format-1.4.3.tgz",
+      "integrity": "sha512-Rp3dUYGqPSn4RY+GDW1GfY++JoFvnXU2E+5pU0/4iYLVgdwt029lRlAsAeHk9lJvq3UXl10l09Cmmj2G1wnNlA=="
     },
     "node_modules/@types/d3-interpolate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-1.4.2.tgz",
-      "integrity": "sha512-ylycts6llFf8yAEs1tXzx2loxxzDZHseuhPokrqKprTQSTcD3JbJI1omZP1rphsELZO3Q+of3ff0ZS7+O6yVzg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-1.4.3.tgz",
+      "integrity": "sha512-eosrP1F0BPnpok+3/dK12/ZusskELe2mZBJfuynIhTw6oCpNcBsVHEJ2dyfTMkm1mv+OX7vQ4G89sYqh9+jHWg==",
       "dependencies": {
         "@types/d3-color": "^1"
       }
     },
     "node_modules/@types/d3-scale": {
-      "version": "1.0.18",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-1.0.18.tgz",
-      "integrity": "sha512-IJ5RvxaesIDSY6z2tGFjt++GxIAm5DSOCVJmt2llqW1T2rP4a3nrJZCsm1HkOFEGcXp5GK3kY8tSBWzj2xqCkQ==",
+      "version": "1.0.19",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-1.0.19.tgz",
+      "integrity": "sha512-Rvx9TqN/FZyRaZMd3hWWTDJzbGOhPZahtrhZxKvTSpq/cvUYggj+pO4aQdtlF11Vyo1D6ZNXltBgtg8TuU2aGw==",
       "dependencies": {
         "@types/d3-time": "^1"
       }
     },
     "node_modules/@types/d3-selection": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.3.tgz",
-      "integrity": "sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA=="
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.4.4.tgz",
+      "integrity": "sha512-nbt9x1vP2C1Wz0JxZ2aSYFvJQIukc1QdL1zGHe5O989bDHpgrVz1mgmA/8n+vapb7g3mjUPe2YoLrqEalmtxKA=="
     },
     "node_modules/@types/d3-time": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.1.tgz",
-      "integrity": "sha512-ULX7LoqXTCYtM+tLYOaeAJK7IwCT+4Gxlm2MaH0ErKLi07R5lh8NHCAyWcDkCCmx1AfRcBEV6H9QE9R25uP7jw=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-1.1.3.tgz",
+      "integrity": "sha512-2Fp6Cad2yRJSNHDvE9TWwYEF2DQABh8zbW9f+QDihq+2Fe7jkUVWZDDGCAhU4H87BSKWfOJnohXjAINuDrxRew=="
     },
     "node_modules/@types/d3-time-format": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.3.1.tgz",
-      "integrity": "sha512-fck0Z9RGfIQn3GJIEKVrp15h9m6Vlg0d5XXeiE/6+CQiBmMDZxfR21XtjEPuDeg7gC3bBM0SdieA5XF3GW1wKA=="
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-2.3.2.tgz",
+      "integrity": "sha512-H1j8FCj8t2EU9+Ndv4jTIqXcPID1UZJpyw3O/W1cZWFl2lj3fSyYqXeTZ9Nhv4nP4XCzRId4C73F0rCBEnuBDg=="
     },
     "node_modules/@types/d3-transition": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-1.3.2.tgz",
-      "integrity": "sha512-J+a3SuF/E7wXbOSN19p8ZieQSFIm5hU2Egqtndbc54LXaAEOpLfDx4sBu/PKAKzHOdgKK1wkMhINKqNh4aoZAg==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-1.3.3.tgz",
+      "integrity": "sha512-G6/XOldxri7B6RlfbtZObrMfxnUUKAIoxxo4E/dlYclX9Zhs7HtHuWrf/iIsrQGYGmqYk2BMqziHvm9gQTBwdQ==",
       "dependencies": {
         "@types/d3-selection": "^1"
       }
     },
     "node_modules/@types/d3-zoom": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-1.8.4.tgz",
-      "integrity": "sha512-K+6jCM9llyC5U4WvkmiXbCoOIuUX03Wi72C/L9PMPVxymWDaxTHzDgHD/HYlEyDRGiVp7D77m7XPcD/m/TRDrw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-1.8.5.tgz",
+      "integrity": "sha512-h79/ayrjJUaXNuTvO1L4pAwBCe1kzLywoE1zjRmHsFftxtHzWco5od9Lv7FCtcwuhSOp1SKS2q3RWolcdJhLOw==",
       "dependencies": {
         "@types/d3-interpolate": "^1",
         "@types/d3-selection": "^1"
@@ -2246,9 +2254,9 @@
       "dev": true
     },
     "node_modules/@types/geojson": {
-      "version": "7946.0.10",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
-      "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="
+      "version": "7946.0.12",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.12.tgz",
+      "integrity": "sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA=="
     },
     "node_modules/@types/js-yaml": {
       "version": "4.0.5",
@@ -2262,9 +2270,9 @@
       "dev": true
     },
     "node_modules/@types/leaflet": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.3.tgz",
-      "integrity": "sha512-Caa1lYOgKVqDkDZVWkto2Z5JtVo09spEaUt2S69LiugbBpoqQu92HYFMGUbYezZbnBkyOxMNPXHSgRrRY5UyIA==",
+      "version": "1.9.6",
+      "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.6.tgz",
+      "integrity": "sha512-HakGTK5LBBWegNWsAmTlG55zN1zszYec7aG47/z6SzT90bW2vqjmbqk3YKAbrtveO+G7fSTKTYqVbIwAFnTrbg==",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -2703,9 +2711,9 @@
       }
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.8.tgz",
-      "integrity": "sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==",
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -6452,9 +6460,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -6570,9 +6578,9 @@
       }
     },
     "node_modules/npm-run-all/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -6959,9 +6967,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.24",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
-      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
@@ -7065,9 +7073,9 @@
       "dev": true
     },
     "node_modules/preact": {
-      "version": "10.15.1",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.15.1.tgz",
-      "integrity": "sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g==",
+      "version": "10.18.1",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.18.1.tgz",
+      "integrity": "sha512-mKUD7RRkQQM6s7Rkmi7IFkoEHjuFqRQUaXamO61E6Nn7vqF/bo7EZCmSyrUnp2UWHw0O7XjZ2eeXis+m7tf4lg==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -7678,9 +7686,9 @@
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -8659,11 +8667,11 @@
       "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
     },
     "node_modules/undici": {
-      "version": "5.24.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.24.0.tgz",
-      "integrity": "sha512-OKlckxBjFl0oXxcj9FU6oB8fDAaiRUq+D8jrFWGmOfI/gIyjk/IeS75LMzgYKUaeHzLUcYvf9bbJGSrUwTfwwQ==",
+      "version": "5.26.3",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.3.tgz",
+      "integrity": "sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==",
       "dependencies": {
-        "busboy": "^1.6.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
         "node": ">=14.0"
@@ -8992,9 +9000,9 @@
       "dev": true
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
diff --git a/esp/src/package.json b/esp/src/package.json
index 90ad2068a7a..ef77a32ff76 100644
--- a/esp/src/package.json
+++ b/esp/src/package.json
@@ -39,21 +39,21 @@
     "@fluentui/react-experiments": "8.14.95",
     "@fluentui/react-hooks": "8.6.29",
     "@fluentui/react-icons-mdl2": "1.3.47",
-    "@hpcc-js/chart": "2.81.6",
-    "@hpcc-js/codemirror": "2.60.11",
-    "@hpcc-js/common": "2.71.11",
-    "@hpcc-js/comms": "2.84.3",
+    "@hpcc-js/chart": "2.81.7",
+    "@hpcc-js/codemirror": "2.60.12",
+    "@hpcc-js/common": "2.71.12",
+    "@hpcc-js/comms": "2.84.4",
     "@hpcc-js/dataflow": "8.1.6",
-    "@hpcc-js/eclwatch": "2.73.26",
-    "@hpcc-js/graph": "2.85.7",
-    "@hpcc-js/html": "2.42.12",
-    "@hpcc-js/layout": "2.49.11",
-    "@hpcc-js/map": "2.77.10",
-    "@hpcc-js/other": "2.15.11",
-    "@hpcc-js/phosphor": "2.16.11",
-    "@hpcc-js/react": "2.53.8",
-    "@hpcc-js/tree": "2.40.11",
-    "@hpcc-js/util": "2.50.5",
+    "@hpcc-js/eclwatch": "2.73.27",
+    "@hpcc-js/graph": "2.85.8",
+    "@hpcc-js/html": "2.42.13",
+    "@hpcc-js/layout": "2.49.12",
+    "@hpcc-js/map": "2.77.11",
+    "@hpcc-js/other": "2.15.12",
+    "@hpcc-js/phosphor": "2.16.12",
+    "@hpcc-js/react": "2.53.9",
+    "@hpcc-js/tree": "2.40.12",
+    "@hpcc-js/util": "2.50.6",
     "@kubernetes/client-node": "0.18.1",
     "clipboard": "2.0.11",
     "d3-dsv": "3.0.1",
diff --git a/esp/src/src-react/components/DFUWorkunitDetails.tsx b/esp/src/src-react/components/DFUWorkunitDetails.tsx
index 5b28af9388b..c03751a0486 100644
--- a/esp/src/src-react/components/DFUWorkunitDetails.tsx
+++ b/esp/src/src-react/components/DFUWorkunitDetails.tsx
@@ -47,8 +47,8 @@ export const DFUWorkunitDetails: React.FunctionComponent<DFUWorkunitDetailsProps
 
     React.useEffect(() => {
         if (!workunit) return;
-        workunit?.fetchXML().then(response => {
-            setWuXML(response.file);
+        workunit?.fetchXML().then(xml => {
+            setWuXML(xml);
         }).catch(err => logger.error(err));
     }, [workunit]);
 
diff --git a/esp/src/src-react/components/Logs.tsx b/esp/src/src-react/components/Logs.tsx
index 5ff36ba9762..6ae979e3b6e 100644
--- a/esp/src/src-react/components/Logs.tsx
+++ b/esp/src/src-react/components/Logs.tsx
@@ -102,7 +102,7 @@ export const Logs: React.FunctionComponent<LogsProps> = ({
 
     const query = React.useMemo(() => {
         if (wuid !== undefined) {
-            filter.jobId = wuid;
+            filter.workunits = wuid;
         }
         if (typeof filter.StartDate === "string") {
             filter.StartDate = new Date(filter.StartDate);
diff --git a/esp/src/src-react/components/WorkunitDetails.tsx b/esp/src/src-react/components/WorkunitDetails.tsx
index 8b17f47aa53..ccfdccccf8c 100644
--- a/esp/src/src-react/components/WorkunitDetails.tsx
+++ b/esp/src/src-react/components/WorkunitDetails.tsx
@@ -66,7 +66,7 @@ export const WorkunitDetails: React.FunctionComponent<WorkunitDetailsProps> = ({
             return response;
         }).then(hasLogAccess => {
             if (hasLogAccess) {
-                service.GetLogsEx({ ...queryParams, jobId: wuid, LogLineStartFrom: 0, LogLineLimit: 10 }).then(response => {    // HPCC-27711 - Requesting LogLineLimit=1 causes issues
+                service.GetLogsEx({ ...queryParams, workunits: wuid, LogLineStartFrom: 0, LogLineLimit: 10 }).then(response => {    // HPCC-27711 - Requesting LogLineLimit=1 causes issues
                     setLogCount(response.total);
                 }).catch((err) => logger.error(err));
             }
diff --git a/esp/src/src-react/components/forms/Fields.tsx b/esp/src/src-react/components/forms/Fields.tsx
index 9f394b0aacc..54bffdaf2a6 100644
--- a/esp/src/src-react/components/forms/Fields.tsx
+++ b/esp/src/src-react/components/forms/Fields.tsx
@@ -902,6 +902,7 @@ export function createInputs(fields: Fields, onChange?: (id: string, newValue: a
                     label: field.label,
                     field: <input
                         key={fieldID}
+                        id={fieldID}
                         type="datetime-local"
                         name={fieldID}
                         defaultValue={field.value}
@@ -910,6 +911,10 @@ export function createInputs(fields: Fields, onChange?: (id: string, newValue: a
                         }}
                     />
                 });
+                const el = document.querySelector(`.ms-Modal.is-open #${fieldID}`);
+                if (el && field.value === "") {
+                    el["value"] = field.value;
+                }
                 break;
             case "link":
                 field.href = field.href;
diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
index b805de14aaf..45d055e8d5c 100644
--- a/helm/hpcc/templates/_helpers.tpl
+++ b/helm/hpcc/templates/_helpers.tpl
@@ -325,9 +325,31 @@ Add ConfigMap volume for a component
     name: {{ .name }}-configmap
 {{- end -}}
 
+{{/*
+Get mount details
+Pass in plane
+Returns dictionary with "results" of mount details
+*/}}
+{{- define "hpcc.getMountDetails" -}}
+{{- $plane := .plane -}}
+{{- $mountPath := $plane.prefix -}}
+{{- $numMounts := int ( $plane.numMounts | default $plane.numDevices | default 1 ) -}}
+{{- $mountDetails := list -}}
+{{- if le $numMounts 1 -}}
+ {{- $mountDetails = append $mountDetails (dict "name" (lower (printf "%s-volume" $plane.name)) "path" $mountPath) -}}
+{{- else -}}
+ {{- range $elem := untilStep 1 (int (add $numMounts 1)) 1 -}}
+  {{- $name := lower (printf "%s-volume-many-%d" $plane.name $elem) -}}
+  {{- $path := printf "%s/d%d" $mountPath $elem -}}
+  {{- $mountDetails = append $mountDetails (dict "name" $name "path" $path) -}}
+ {{- end -}}
+{{- end -}}
+{{- $_ := set . "results" $mountDetails -}}
+{{- end -}}
+
 {{/*
 Add volume mounts
-Pass in root, me (the component), includeCategories (optional) and/or includeNames (optional), container identifier (optional)
+Pass in root, me (the component), includeCategories (optional) and/or includeNames (optional)
 Note: if there are multiple planes (other than dll, dali and spill planes), they should be all called with a single call
 to addVolumeMounts so that if a plane can be used for multiple purposes then duplicate volume mounts are not created.
 */}}
@@ -339,7 +361,6 @@ to addVolumeMounts so that if a plane can be used for multiple purposes then dup
 {{- $includeNames := .includeNames | default list -}}
 {{- $component := .me -}}
 {{- $previousMounts := dict -}}
-{{- $id := .id | default "" -}}
 {{- range $plane := $planes -}}
  {{- if not $plane.disabled }}
   {{- $componentMatches := or (not (hasKey $plane "components")) (has $component.name $plane.components) -}}
@@ -349,14 +370,12 @@ to addVolumeMounts so that if a plane can be used for multiple purposes then dup
     {{- if not (hasKey $previousMounts $plane.prefix) }}
      {{- $mountPath := $plane.prefix }}
      {{- $numMounts := int ( $plane.numMounts | default $plane.numDevices | default 1 ) }}
-     {{- if le $numMounts 1 }}
-- name: {{ lower $plane.name }}-volume
-  mountPath: {{ $mountPath | quote }}
-     {{- else }}
-      {{- range $elem := untilStep 1 (int (add $numMounts 1)) 1 }}
-- name: {{ lower $plane.name }}-volume-many-{{ $elem }}
-  mountPath: {{ printf "%s/d%d" $mountPath $elem | quote }}
-      {{- end }}
+     {{- $mountDetails := dict "plane" $plane }}
+     {{- include "hpcc.getMountDetails" $mountDetails }}
+     {{- range $elem := untilStep 1 (int (add $numMounts 1)) 1 }}
+      {{- $multiMountDetails := index $mountDetails.results (sub $elem 1) }}
+- name: {{ $multiMountDetails.name }}
+  mountPath: {{ $multiMountDetails.path | quote }}
      {{- end }}
     {{- end }}
     {{- $_ := set $previousMounts $plane.prefix true -}}
@@ -364,9 +383,6 @@ to addVolumeMounts so that if a plane can be used for multiple purposes then dup
     {{- if not (hasKey $previousMounts $plane.prefix) }}
 - name: {{ lower $plane.name }}-volume
   mountPath: {{ $plane.prefix | quote }}
-     {{- if $id }}
-  subPath: {{ printf "%s-%s" $component.name $id }}
-     {{- end }}
     {{- end }}
    {{- end }}
 
@@ -504,9 +520,9 @@ Pass in dict with root, planeName
 {{- range $plane := $planes -}}
  {{- if (eq $plane.name $name) -}}
   {{- if $plane.subPath -}}
-   {{- printf "%s/%s" $plane.prefix $plane.subPath | quote -}}
+   {{- printf "%s/%s" $plane.prefix $plane.subPath -}}
   {{- else -}}
-   {{- $plane.prefix | quote -}}
+   {{- $plane.prefix -}}
   {{- end -}}
  {{- end -}}
 {{- end -}}
@@ -895,13 +911,22 @@ A kludge to ensure mounted storage (e.g. for nfs, minikube or docker for desktop
 {{- $permCmd := "" -}}
 {{- $uid := .uid -}}
 {{- $gid := .gid -}}
-{{- range $index, $volume := .volumes }}
- {{- if ne $index 0 }}
-  {{- $permCmd = printf "%s & " $permCmd -}}
- {{- end -}}
- {{- $permCmd = printf "%s(chown -R %v:%v %s || true)" $permCmd $uid $gid $volume.path }}
+{{- $component := .component -}}
+{{- $volumeNames := list -}}
+{{- $count := 0 -}}
+{{- range $plane := .planes }}
+ {{- $volumeNames = append $volumeNames $plane.name }}
+ {{- $mountDetails := dict "plane" $plane }}
+ {{- include "hpcc.getMountDetails" $mountDetails }}
+ {{- range $result := $mountDetails.results }}
+  {{- if ne $count 0 }}
+   {{- $permCmd = printf "%s & " $permCmd -}}
+  {{- end -}}
+  {{- $permCmd = printf "%s(chown -R %v:%v %s || true)" $permCmd $uid $gid $result.path }}
+  {{- $count = add $count 1 }}
+ {{- end }}
 {{- end }}
-{{- if gt (len .volumes) 1 -}}
+{{- if gt $count 1 -}}
  {{- $permCmd = printf "%s; wait" $permCmd -}}
 {{- end }}
 - name: volume-mount-hack
@@ -912,10 +937,7 @@ A kludge to ensure mounted storage (e.g. for nfs, minikube or docker for desktop
              "{{ $permCmd }}"
            ]
   volumeMounts:
-{{- range $volume := .volumes }}
-    - name: {{ $volume.name | quote}}
-      mountPath: {{ $volume.path | quote }}
-{{- end }}
+{{ include "hpcc.addVolumeMounts" (dict "root" .root "component" $component "includeNames" $volumeNames) | indent 2 }}
 {{- end }}
 
 
@@ -958,11 +980,7 @@ NB: uid=10000 and gid=10001 are the uid/gid of the hpcc user, built into platfor
 {{- end -}}
 {{- $volumes := list -}}
 {{- if len $planesToChown -}}
- {{- range $plane := $planesToChown -}}
-  {{- $volumeName := (printf "%s-volume" $plane.name) -}}
-  {{- $volumes = append $volumes (dict "name" $volumeName "path" $plane.prefix) -}}
- {{- end -}}
- {{- include "hpcc.changeMountPerms" (dict "root" $root "uid" $uid "gid" $gid "volumes" $volumes) | nindent 0 }}
+ {{- include "hpcc.changeMountPerms" (dict "root" $root "component" $component "uid" $uid "gid" $gid "planes" $planesToChown) | nindent 0 }}
 {{- end -}}
 {{- include "hpcc.configContainer" . | nindent 0 -}}
 {{- end -}}
@@ -2394,7 +2412,7 @@ global.noResourceValidation flag.  This behavior can be overridden by the caller
 A template to output a merged environment. Pass in a list with global then local environments. Only the last specified value for each named environment variable will be output
 */}}
 {{- define "hpcc.mergeEnvironments" -}}
-{{- $result := dict "MALLOC_ARENA_MAX" "8" -}}{{- /* HPCC arena default, can be overriden by component config */ -}}
+{{- $result := dict "MALLOC_ARENA_MAX" 8 -}}{{- /* HPCC arena default, can be overriden by component config */ -}}
 {{- range . -}}
  {{- $_ := set $result .name .value -}}
 {{- end -}}
diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml
index 3bba572ba45..0d01d3a5e91 100644
--- a/helm/hpcc/templates/thor.yaml
+++ b/helm/hpcc/templates/thor.yaml
@@ -255,7 +255,7 @@ data:
             workingDir: /var/lib/HPCCSystems
             volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" $configCtx.me | indent 12 }}
-{{ include "hpcc.addVolumeMounts" (deepCopy $configCtx | merge (dict "id" (toString $containerNum))) | indent 12 }}
+{{ include "hpcc.addVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addSecretVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addVaultClientCertificateVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addCertificateVolumeMount" (dict "root" $configCtx.root "name" $configCtx.me.name "component" "thorworker" "includeRemote" true) | indent 12 }}
diff --git a/thorlcr/master/mawatchdog.hpp b/thorlcr/master/mawatchdog.hpp
index 6383694882f..e4f732a41d9 100644
--- a/thorlcr/master/mawatchdog.hpp
+++ b/thorlcr/master/mawatchdog.hpp
@@ -31,7 +31,7 @@ class CMasterWatchdog : public CSimpleInterface, implements IThreaded
     PointerArray state;
     SocketEndpoint master;
     Mutex mutex;
-    int retrycount;
+    int retrycount = 0;
     CThreaded threaded;
 protected:
     bool stopped;