correct declaration of env object/dic/lookup

ensure object before attempting to call function
Merge pull request #4156 from node-red/4133-mqtt-v5-disconnects-when-subscribing-to-aws-core-broker
2025-03-01 10:36:34 +00:00 · 2023-06-09 11:30:21 +01:00 · 2023-06-09 11:29:54 +01:00 · 2023-05-22 16:42:25 +01:00 · 2023-05-22 15:16:58 +01:00 · 2023-05-22 12:51:46 +01:00
162 changed files with 1375 additions and 468 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,9 @@ on:
  release:
    types: [published]

+permissions:
+  contents: read
+
 jobs:
  generate:
    name: 'Update node-red-docker image'
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,16 +6,22 @@ on:
  pull_request:
    branches: [ master, dev ]

+permissions:
+  contents: read
+
 jobs:
  build:
+    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
+      contents: read  # for actions/checkout to fetch code
    runs-on: ubuntu-latest
    strategy:
      matrix:
        node-version: [14, 16]
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
      with:
        node-version: ${{ matrix.node-version }}
    - name: Install Dependencies
@@ -23,8 +29,8 @@ jobs:
    - name: Run tests
      run: |
        npm run test
-    - name: Publish to coveralls.io
-      if: ${{ matrix.node-version == 14 }}
-      uses: coverallsapp/github-action@v1.1.2
-      with:
-        github-token: ${{ github.token }}
+    # - name: Publish to coveralls.io
+    #   if: ${{ matrix.node-version == 14 }}
+    #   uses: coverallsapp/github-action@v1.1.2
+    #   with:
+    #     github-token: ${{ github.token }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+#### 3.0.2: Maintenance Release
+
+Editor
+
+ - Fix workspace chart bottom property (#3812) @bonanitech
+ - Update german translation (#3802) @Dennis14e
+ - Support color reset to the default in subflow and group (#3801) @kazuhitoyokoi
+ - Allow generateNodeNames to handle names containing regex control chars (#3817) @knolleary
+ - Hide scrollbars until they're needed (#3808) @bonanitech
+ - Include junctions/groups when exporting subflows plus related fixes (#3816) @knolleary
+ - remove console.log (#3820) @Steve-Mcl
+
+Runtime
+
+ - Register subflow module instance node with parent flow (#3818) @knolleary
+
+Nodes
+
+ - HTTP Request: Allow HTTP Headers not in spec (#3776) @hardillb
+
+#### 3.0.1: Maintenance Release
+
+Editor
+
+ - Allow codeEditor theme to be set even if `codeEditor` is not set in settings.js (#3794) @Steve-Mcl
+ - Sys info (diagnostics report) amendments (#3793) @Steve-Mcl
+ - Allow `mode` and `title` to be omitted in `options` argument for `createEditor` (#3791) @Steve-Mcl
+ - Fix focus issues (#3789) @Steve-Mcl
+ - Ensure all typedInput buttons have button type set (#3788) @knolleary
+ - Do not flag hasUsers=false nodes as unused in search (#3787) @knolleary
+ - Properly position quick-add dialog in all cases (#3786) @knolleary
+ - Ensure quick-add dialog does not obscure ghost node when shifted (#3785) @knolleary
+ - Remove use of Object.hasOwn (#3784) @knolleary
+
 #### 3.0.0: Milestone Release

 Editor
--- a/README.md
+++ b/README.md
@@ -2,8 +2,7 @@

 http://nodered.org

-[![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
-[![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)
+[![Build Status](https://github.com/node-red/node-red/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/node-red/node-red/actions?query=branch%3Amaster)

 Low-code programming for event-driven applications.

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "3.0.0",
+    "version": "3.0.2",
    "description": "Low-code programming for event-driven applications",
    "homepage": "http://nodered.org",
    "license": "Apache-2.0",
@@ -40,7 +40,7 @@
        "cookie-parser": "1.4.6",
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
-        "denque": "2.0.1",
+        "denque": "2.1.0",
        "express": "4.18.1",
        "express-session": "1.17.3",
        "form-data": "4.0.0",
@@ -49,7 +49,7 @@
        "hash-sum": "2.0.0",
        "hpagent": "1.0.0",
        "https-proxy-agent": "5.0.1",
-        "i18next": "21.8.14",
+        "i18next": "21.8.16",
        "iconv-lite": "0.6.3",
        "is-utf8": "0.2.1",
        "js-yaml": "4.1.0",
@@ -76,7 +76,7 @@
        "semver": "7.3.7",
        "tar": "6.1.11",
        "tough-cookie": "4.0.0",
-        "uglify-js": "3.16.2",
+        "uglify-js": "3.16.3",
        "uuid": "8.3.2",
        "ws": "7.5.6",
        "xml2js": "0.4.23"
@@ -85,7 +85,7 @@
        "bcrypt": "5.0.1"
    },
    "devDependencies": {
-        "dompurify": "2.3.9",
+        "dompurify": "2.3.10",
        "grunt": "1.5.3",
        "grunt-chmod": "~1.1.1",
        "grunt-cli": "~1.4.3",
@@ -114,7 +114,7 @@
        "node-red-node-test-helper": "^0.3.0",
        "nodemon": "2.0.19",
        "proxy": "^1.0.2",
-        "sass": "1.53.0",
+        "sass": "1.54.2",
        "should": "13.2.3",
        "sinon": "11.1.2",
        "stoppable": "^1.1.0",
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -327,9 +327,8 @@ module.exports = {
                        themeContext.header.url = themePlugin.header.url || themeContext.header.url
                    }
                }
-                if(theme.codeEditor) {
-                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
-                }
+                theme.codeEditor = theme.codeEditor || {}
+                theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
            }
            activeThemeInitialised = true;
        }
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-api",
-    "version": "3.0.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.0.0",
-        "@node-red/editor-client": "3.0.0",
+        "@node-red/util": "3.0.2",
+        "@node-red/editor-client": "3.0.2",
        "bcryptjs": "2.4.3",
        "body-parser": "1.20.0",
        "clone": "2.1.2",
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -105,7 +105,7 @@
            "search": "Flows durchsuchen",
            "searchInput": "Flows durchsuchen",
            "subflows": "Subflow",
-            "createSubflow": "Subflow",
+            "createSubflow": "Hinzufügen",
            "selectionToSubflow": "Auswahl in Subflow umwandeln",
            "flows": "Flow",
            "add": "Hinzufügen",
@@ -152,7 +152,8 @@
        "zoom-in": "Vergrößern",
        "search-flows": "Flows durchsuchen",
        "search-prev": "Vorherige",
-        "search-next": "Nächste"
+        "search-next": "Nächste",
+        "search-counter": "\"__term__\" __result__ von __count__"
    },
    "user": {
        "loggedInAs": "Angemeldet als __name__",
@@ -168,7 +169,11 @@
        }
    },
    "notification": {
-        "warning": "<strong>Warnung:</strong> __message__",
+        "state": {
+            "flowsStopped": "Flows gestoppt",
+            "flowsStarted": "Flows gestartet"
+        },
+        "warning": "<strong>Warnung</strong>: __message__",
        "warnings": {
            "undeployedChanges": "Node hat nicht übernommene (deploy) Änderungen",
            "nodeActionDisabled": "Node-Aktionen deaktiviert",
@@ -177,15 +182,15 @@
            "missing-modules": "<p>Flows angehalten aufgrund fehlender Module</p>",
            "safe-mode": "<p>Flows sind im abgesicherten Modus gestoppt.</p><p>Flows können bearbeitet und übernommen (deploy) werden, um sie neu zu starten.</p>",
            "restartRequired": "Node-RED muss neu gestartet werden, damit die Module nach Upgrade aktiviert werden",
-            "credentials_load_failed": "<p>Flows gestoppt, da die Berechtigungen nicht entschlüsselt werden konnten.</p><p>Die Datei mit dem Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
-            "credentials_load_failed_reset": "<p>Die Berechtigungen konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Berechtigungen wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Berechtigungen werden gelöscht.</p>",
+            "credentials_load_failed": "<p>Flows gestoppt, da die Credentials nicht entschlüsselt werden konnten.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
+            "credentials_load_failed_reset": "<p>Die Credentials konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Credentials wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Credentials werden gelöscht.</p>",
            "missing_flow_file": "<p>Die Flow-Datei des Projekts wurde nicht gefunden.</p><p>Das Projekt ist nicht mit einer Flow-Datei konfiguriert.</p>",
            "missing_package_file": "<p>Die Paket-Datei des Projekts wurde nicht gefunden.</p><p>In dem Projekt fehlt die 'package.json'-Datei.</p>",
            "project_empty": "<p>Das Projekt ist leer.</p><p>Soll ein Standardsatz an Projektdateien erstellen werden?<br/>Andernfalls müssen die Dateien manuell außerhalb des Editors dem Projekt hinzugefügt werden.</p>",
            "project_not_found": "<p>Das Projekt '__project__' wurde nicht gefunden.</p>",
            "git_merge_conflict": "<p>Der automatische Merge der Änderungen ist fehlgeschlagen.</p><p>Die Merge-Konflikte müssen behoben und die Ergebnisse ins Repository übertragen werden (commit).</p>"
        },
-        "error": "<strong>Fehler:</strong> __message__",
+        "error": "<strong>Fehler</strong>: __message__",
        "errors": {
            "lostConnection": "Verbindung zum Server verloren. Verbindung wird erneut hergestellt ...",
            "lostConnectionReconnect": "Verbindung zum Server verloren. Wiederherstellung der Verbindung in __time__s.",
@@ -203,7 +208,7 @@
            "pull": "Projekt '__project__' erneut geladen",
            "revert": "Änderungen im Projekt '__project__' rückgängig gemacht",
            "merge-complete": "Git-Merge abgeschlossen",
-            "setupCredentials": "Berechtigungen einrichten",
+            "setupCredentials": "Credentials einrichten",
            "setupProjectFiles": "Projektdateien einrichten",
            "no": "Nein, Danke",
            "createDefault": "Standardprojektdateien erstellen",
@@ -211,7 +216,7 @@
        },
        "label": {
            "manage-project-dep": "Projektabhängigkeiten verwalten",
-            "setup-cred": "Berechtigungen einrichten",
+            "setup-cred": "Credentials einrichten",
            "setup-project": "Projektdateien einrichten",
            "create-default-package": "Standardpaketdatei erstellen",
            "no-thanks": "Nein, Danke",
@@ -295,6 +300,10 @@
        "modifiedFlowsDesc": "Übernimmt nur Flows, die geänderte Nodes enthalten",
        "modifiedNodes": "Geänderte Nodes",
        "modifiedNodesDesc": "Übernimmt nur Nodes, die sich geändert haben",
+        "startFlows": "Start",
+        "startFlowsDesc": "Flows starten",
+        "stopFlows": "Stop",
+        "stopFlowsDesc": "Flows stoppen",
        "restartFlows": "Flows neustarten",
        "restartFlowsDesc": "Startet die aktuell übernommenen Flows (ohne vorheriges Deploy)",
        "successfulDeploy": "Erfolgreich übernommen (deploy)",
@@ -376,7 +385,7 @@
        "confirmDelete": "Sind Sie sicher mit dem Löschen dieses Subflows?",
        "info": "Beschreibung",
        "category": "Kategorie",
-        "module": "Module",
+        "module": "Modul",
        "license": "Lizenz",
        "licenseNone": "Keine",
        "licenseOther": "Andere",
@@ -434,7 +443,7 @@
        "icon": "Icon",
        "inputType": "Eingangstyp",
        "selectType": "Wähle Typen ...",
-        "loadCredentials": "Lade Node-Berechtigungen",
+        "loadCredentials": "Lade Node-Credentials",
        "inputs": {
            "input": "Eingang",
            "select": "Auswahl",
@@ -450,7 +459,7 @@
            "json": "JSON",
            "bin": "buffer",
            "env": "Umgebungsvariable",
-            "cred": "Berechtigung"
+            "cred": "Credentials"
        },
        "menu": {
            "input": "Eingang",
@@ -470,7 +479,7 @@
        "errors": {
            "scopeChange": "Wenn Sie den Geltungsbereich (scope) ändern, wird er für Nodes in anderen Flows nicht verfügbar sein",
            "invalidProperties": "Ungültige Eigenschaften:",
-            "credentialLoadFailed": "Laden der Node-Berechtigungen fehlgeschlagen"
+            "credentialLoadFailed": "Laden der Node-Credentials fehlgeschlagen"
        }
    },
    "keyboard": {
@@ -683,7 +692,8 @@
            "showHelp": "Hilfe zeigen",
            "showInOutline": "Zeige im Editor",
            "showTopics": "Zeige Hilfethemen",
-            "noHelp": "Kein Hilfethema ausgewählt"
+            "noHelp": "Kein Hilfethema ausgewählt",
+            "changeLog": "Änderungsprotokoll"
        },
        "config": {
            "name": "Konfigurations-Node",
@@ -737,7 +747,7 @@
                "addToProject": "Zu Projekt hinzufügen",
                "files": "Dateien",
                "flow": "Flow",
-                "credentials": "Berechtigungen",
+                "credentials": "Credentials",
                "package": "Paket",
                "packageCreate": "Datei wird erstellt beim Speichern der Änderungen",
                "fileNotExist": "Datei existiert nicht",
@@ -750,7 +760,7 @@
                "changeTheEncryptionKey": "Schlüssel ändern",
                "currentKey": "Aktueller Schlüssel",
                "newKey": "Neuer Schlüssel",
-                "credentialsAlert": "Dadurch werden alle vorhandenen Berechtigungen gelöscht",
+                "credentialsAlert": "Dadurch werden alle vorhandenen Credentials gelöscht",
                "versionControl": "Versionsverwaltung (Git)",
                "branches": "Branches",
                "noBranches": "Keine Branches",
@@ -886,7 +896,7 @@
            "date": "timestamp",
            "jsonata": "JSONata",
            "env": "Umgebungsvariable",
-            "cred": "Berechtigung"
+            "cred": "Credentials"
        }
    },
    "editableList": {
@@ -1026,7 +1036,7 @@
            "passphrase": "Passphrase",
            "ssh-key-desc": "Bevor Sie ein Repository über SSH lokal klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zugreifen zu können",
            "ssh-key-add": "SSH-Schlüssel hinzufügen",
-            "credential-key": "Schlüssel für Berechtigungen",
+            "credential-key": "Schlüssel für Credentials",
            "cant-get-ssh-key": "Fehler! Der ausgewählte SSH-Schlüsselpfad kann nicht abgerufen werden",
            "already-exists2": "bereits vorhanden",
            "git-error": "Git-Fehler",
@@ -1038,27 +1048,27 @@
            "create": "Erstellen Sie Ihre Projektdateien",
            "desc0": "Ein Projekt enthält Ihre Flow-Dateien, eine README-Datei und die 'package.json'-Datei.",
            "desc1": "Es kann alle anderen Dateien enthalten, die im Git-Repository verwaltet werden sollen.",
-            "desc2": "Ihre vorhandenen Flow- und Berechtigungs-Dateien werden in das Projekt kopiert.",
+            "desc2": "Ihre vorhandenen Flow- und Credential-Dateien werden in das Projekt kopiert.",
            "flow-file": "Flow-Datei",
-            "credentials-file": "Datei mit Berechtigungen"
+            "credentials-file": "Datei mit Credentials"
        },
        "encryption-config": {
-            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Berechtigungen",
-            "desc0": "Die Datei mit den Flow-Berechtigungen kann verschlüsselt werden, um ihren Inhalt zu schützen.",
-            "desc1": "Wenn Sie diese Berechtigungen in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
-            "desc2": "Die Datei mit den Flow-Berechtigungen ist derzeit nicht verschlüsselt.",
+            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Credentials",
+            "desc0": "Die Datei mit den Flow-Credentials kann verschlüsselt werden, um ihren Inhalt zu schützen.",
+            "desc1": "Wenn Sie diese Credentials in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
+            "desc2": "Die Datei mit den Flow-Credentials ist derzeit nicht verschlüsselt.",
            "desc3": "D.h. ihr Inhalt (z.B. Passwörter und Zugriffs-Tokens) kann von jedem mit Zugriff auf die Datei gelesen werden.",
-            "desc4": "Wenn Sie diese Berechtigungen in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
-            "desc5": "Ihre Datei mit den Flow-Berechtigungen wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
-            "desc6": "Die Datei mit den Flow-Berechtigungen wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
+            "desc4": "Wenn Sie diese Credentials in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
+            "desc5": "Ihre Datei mit den Flow-Credentials wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
+            "desc6": "Die Datei mit den Flow-Credentials wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
            "desc7": "Der Schlüssel wird separat von den Projektdateien gespeichert. Sie müssen den Schlüssel angeben, damit dieses Projekt auch in einem anderen Node-RED-System verwendet werden kann.",
-            "credentials": "Berechtigung",
+            "credentials": "Credentials",
            "enable": "Verschlüsselung aktivieren",
            "disable": "Verschlüsselung deaktivieren",
            "disabled": "deaktiviert",
            "copy": "Vorhandenen Schlüssel ersetzen",
            "use-custom": "Eigenen Schlüssel verwenden",
-            "desc8": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
+            "desc8": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
            "create-project-files": "Projektdateien erstellen",
            "create-project": "Projekt erstellen",
            "already-exists": "bereits vorhanden",
@@ -1083,12 +1093,12 @@
            "desc": "Beschreibung",
            "opt": "Optional",
            "flow-file": "Flow-Datei",
-            "credentials": "Berechtigungen",
+            "credentials": "Credentials",
            "enable-encryption": "Verschlüsselung aktivieren",
            "disable-encryption": "Verschlüsselung deaktivieren",
            "encryption-key": "Schlüssel",
-            "desc0": "Eine Floskel, mit der Sie Ihre Berechtigungen schützen",
-            "desc1": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
+            "desc0": "Eine Ausdruck, mit der Sie Ihre Credentials schützen",
+            "desc1": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
            "git-url": "Git-Repository-URL",
            "protocols": "https://, ssh:// oder file://",
            "auth-failed": "Authentifizierung fehlgeschlagen",
@@ -1098,7 +1108,7 @@
            "passphrase": "Passphrase",
            "desc2": "Bevor Sie ein Repository über SSH klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zu zugreifen",
            "add-ssh-key": "Einen SSH-Schlüssel hinzufügen",
-            "credentials-encryption-key": "Schlüssel für Berechtigungen",
+            "credentials-encryption-key": "Schlüssel für Credentials",
            "already-exists-2": "bereits vorhanden",
            "git-error": "Git-Fehler",
            "con-failed": "Verbindung fehlgeschlagen",
@@ -1156,7 +1166,8 @@
    "tourGuide": {
        "takeATour": "Tour starten",
        "start": "Start",
-        "next": "Nächste"
+        "next": "Nächste",
+        "welcomeTours": "Welcome Tours"
    },
    "diagnostics": {
        "title": "System-Informationen"
--- a/packages/node_modules/@node-red/editor-client/locales/de/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/jsonata.json
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -491,6 +491,7 @@
        "unassigned": "Unassigned",
        "global": "global",
        "workspace": "workspace",
+        "editor": "edit dialog",
        "selectAll": "Select all",
        "selectNone": "Select none",
        "selectAllConnected": "Select connected",
@@ -683,6 +684,8 @@
            "empty": "empty",
            "globalConfig": "Global Configuration Nodes",
            "triggerAction": "Trigger action",
+            "showFlow": "Show",
+            "hideFlow": "Hide",
            "find": "Find in workspace"
        },
        "help": {
@@ -936,6 +939,9 @@
            "invalid-expr": "Invalid JSONata expression:\n  __message__",
            "invalid-msg": "Invalid example JSON message:\n  __message__",
            "context-unsupported": "Cannot test context functions\n $flowContext or $globalContext",
+            "env-unsupported": "Cannot test $env function",
+            "moment-unsupported": "Cannot test $moment function",
+            "clone-unsupported": "Cannot test $clone function",
            "eval": "Error evaluating expression:\n  __message__"
        }
    },
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -491,6 +491,7 @@
        "unassigned": "未割当",
        "global": "グローバル",
        "workspace": "ワークスペース",
+        "editor": "編集ダイアログ",
        "selectAll": "全てのノードを選択",
        "selectNone": "選択を外す",
        "selectAllConnected": "接続されたノードを選択",
@@ -683,6 +684,8 @@
            "empty": "空",
            "globalConfig": "グローバル設定ノード",
            "triggerAction": "アクションを実行",
+            "showFlow": "表示",
+            "hideFlow": "非表示",
            "find": "ワークスペース内を検索"
        },
        "help": {
@@ -935,8 +938,11 @@
        "errors": {
            "invalid-expr": "不正なJSONata式:\n  __message__",
            "invalid-msg": "不正なJSONメッセージ例:\n  __message__",
-            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト機能をテストできません",
-            "eval": "表現評価エラー:\n  __message__"
+            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト関数をテストできません",
+            "env-unsupported": "$env関数はテストできません",
+            "moment-unsupported": "$moment関数はテストできません",
+            "clone-unsupported": "$clone関数はテストできません",
+            "eval": "式評価エラー:\n  __message__"
        }
    },
    "monaco": {
@@ -1168,8 +1174,7 @@
        "takeATour": "ツアーを開始",
        "start": "開始",
        "next": "次へ",
-        "welcomeTours": "ウェルカムツアー",
-        "tours": "ツアー"
+        "welcomeTours": "ウェルカムツアー"
    },
    "diagnostics": {
        "title": "システム情報"
--- a/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/editor.json
--- a/packages/node_modules/@node-red/editor-client/locales/ko/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ko/jsonata.json
--- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
--- a/packages/node_modules/@node-red/editor-client/locales/ru/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/infotips.json
--- a/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-client",
-    "version": "3.0.0",
+    "version": "3.0.2",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -868,14 +868,7 @@ RED.nodes = (function() {
            var node;

            if (allNodes.hasTab(id)) {
-                removedNodes = allNodes.getNodes(id).filter(n => {
-                    if (n.type === 'junction') {
-                        removedJunctions.push(n)
-                        return false
-                    } else {
-                        return true
-                    }
-                })
+                removedNodes = allNodes.getNodes(id).slice()
            }
            for (i in configNodes) {
                if (configNodes.hasOwnProperty(i)) {
@@ -885,6 +878,7 @@ RED.nodes = (function() {
                    }
                }
            }
+            removedJunctions = RED.nodes.junctions(id)

            for (i=0;i<removedNodes.length;i++) {
                var result = removeNode(removedNodes[i].id);
@@ -1331,7 +1325,6 @@ RED.nodes = (function() {
        } else {
            nodeSet = [sf];
        }
-        console.log(nodeSet);
        return createExportableNodeSet(nodeSet);
    }
    /**
@@ -1367,6 +1360,10 @@ RED.nodes = (function() {
                            exportedConfigNodes[n.id] = true;
                        }
                    });
+
+                    subflowSet = subflowSet.concat(RED.nodes.junctions(subflowId))
+                    subflowSet = subflowSet.concat(RED.nodes.groups(subflowId))
+
                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                    nns = exportableSubflow.concat(nns);
                }
@@ -1968,7 +1965,7 @@ RED.nodes = (function() {
                        }
                    }
                } else {
-                    const keepNodesCurrentZ = reimport && n.z && RED.workspaces.contains(n.z)
+                    const keepNodesCurrentZ = reimport && n.z && (RED.workspaces.contains(n.z) || RED.nodes.subflow(n.z))
                    if (!keepNodesCurrentZ && n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                        n.z = activeWorkspace;
                    }
@@ -2070,7 +2067,7 @@ RED.nodes = (function() {
                        node.id = getID();
                    } else {
                        node.id = n.id;
-                        const keepNodesCurrentZ = reimport && node.z && RED.workspaces.contains(node.z)
+                        const keepNodesCurrentZ = reimport && node.z && (RED.workspaces.contains(node.z) || RED.nodes.subflow(node.z))
                        if (!keepNodesCurrentZ && (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z]))) {
                            if (createMissingWorkspace) {
                                if (missingWorkspace === null) {
@@ -2098,16 +2095,27 @@ RED.nodes = (function() {
                    } else if (n.type.substring(0,7) === "subflow") {
                        var parentId = n.type.split(":")[1];
                        var subflow = subflow_denylist[parentId]||subflow_map[parentId]||getSubflow(parentId);
-                        if (createNewIds || options.importMap[n.id] === "copy") {
-                            parentId = subflow.id;
-                            node.type = "subflow:"+parentId;
-                            node._def = registry.getNodeType(node.type);
-                            delete node.i;
+                        if (!subflow){
+                            node._def = {
+                                color:"#fee",
+                                defaults: {},
+                                label: "unknown: "+n.type,
+                                labelStyle: "red-ui-flow-node-label-italic",
+                                outputs: n.outputs|| (n.wires && n.wires.length) || 0,
+                                set: registry.getNodeSet("node-red/unknown")
+                            }
+                        } else {
+                            if (createNewIds || options.importMap[n.id] === "copy") {
+                                parentId = subflow.id;
+                                node.type = "subflow:"+parentId;
+                                node._def = registry.getNodeType(node.type);
+                                delete node.i;
+                            }
+                            node.name = n.name;
+                            node.outputs = subflow.out.length;
+                            node.inputs = subflow.in.length;
+                            node.env = n.env;
                        }
-                        node.name = n.name;
-                        node.outputs = subflow.out.length;
-                        node.inputs = subflow.in.length;
-                        node.env = n.env;
                    } else if (n.type === 'junction') {
                         node._def = {defaults:{}}
                         node._config.x = node.x
@@ -2743,6 +2751,7 @@ RED.nodes = (function() {
                    }
                });

+                const nodeGroupMap = {}
                var replaceNodeIds = Object.keys(replaceNodes);
                if (replaceNodeIds.length > 0) {
                    var reimportList = [];
@@ -2753,6 +2762,12 @@ RED.nodes = (function() {
                        } else {
                            allNodes.removeNode(n);
                        }
+                        if (n.g) {
+                            // reimporting a node *without* including its group object
+                            // will cause the g property to be cleared. Cache it
+                            // here so we can restore it
+                            nodeGroupMap[n.id] = n.g
+                        }
                        reimportList.push(convertNode(n));
                        RED.events.emit('nodes:remove',n);
                    });
@@ -2774,6 +2789,18 @@ RED.nodes = (function() {
                    var newNodeMap = {};
                    result.nodes.forEach(function(n) {
                        newNodeMap[n.id] = n;
+                        if (nodeGroupMap[n.id]) {
+                            // This node is in a group - need to substitute the
+                            // node reference inside the group
+                            n.g = nodeGroupMap[n.id]
+                            const group = RED.nodes.group(n.g)
+                            if (group) {
+                                var index = group.nodes.findIndex(gn => gn.id === n.id)
+                                if (index > -1) {
+                                    group.nodes[index] = n
+                                }
+                            }
+                        }
                    });
                    RED.nodes.eachLink(function(l) {
                        if (newNodeMap.hasOwnProperty(l.source.id)) {
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -321,6 +321,8 @@ var RED = (function() {
                        loader.end()
                        RED.notify($("<p>").text(message));
                        RED.sidebar.info.refresh()
+                        RED.menu.setDisabled('menu-item-projects-open',false);
+                        RED.menu.setDisabled('menu-item-projects-settings',false);
                    });
                });
                return;
@@ -766,7 +768,7 @@ var RED = (function() {
        $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
        $('<div id="red-ui-main-container" class="red-ui-sidebar-closed hide">'+
            '<div id="red-ui-workspace"></div>'+
-            '<div id="red-ui-editor-stack"></div>'+
+            '<div id="red-ui-editor-stack" tabindex="-1"></div>'+
            '<div id="red-ui-palette"></div>'+
            '<div id="red-ui-sidebar"></div>'+
            '<div id="red-ui-sidebar-separator"></div>'+
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js
@@ -47,7 +47,7 @@ RED.actionList = (function() {
        var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
        searchInput = $('<input type="text" data-i18n="[placeholder]keyboard.filterActions">').appendTo(searchDiv).searchBox({
            change: function() {
-                filterTerm = $(this).val().trim();
+                filterTerm = $(this).val().trim().toLowerCase();
                filterTerms = filterTerm.split(" ");
                searchResults.editableList('filter');
                searchResults.find("li.selected").removeClass("selected");
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -37,13 +37,13 @@ RED.clipboard = (function() {
            // IE11 workaround
            // IE does not support data uri scheme for downloading data
            var blob = new Blob([data], {
-                type: "data:text/plain;charset=utf-8"
+                type: "data:application/json;charset=utf-8"
            });
            navigator.msSaveBlob(blob, file);
        }
        else {
            var element = document.createElement('a');
-            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data));
+            element.setAttribute('href', 'data:application/json;charset=utf-8,' + encodeURIComponent(data));
            element.setAttribute('download', file);
            element.style.display = 'none';
            document.body.appendChild(element);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -160,7 +160,7 @@
                this.element.css("maxHeight",null);
            }
            if (this.options.height !== 'auto') {
-                this.uiContainer.css("overflow-y","scroll");
+                this.uiContainer.css("overflow-y","auto");
                if (!isNaN(this.options.height)) {
                    this.uiHeight = this.options.height;
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -90,10 +90,10 @@
                        optEl.append(generateSpans(srcMatch));
                        optEl.appendTo(element);
                    }
-                    matches.push({ 
-                        value: optVal, 
-                        label: element, 
-                        i: (valMatch.found ? valMatch.index : srcMatch.index) 
+                    matches.push({
+                        value: optVal,
+                        label: element,
+                        i: (valMatch.found ? valMatch.index : srcMatch.index)
                    });
                }
            })
@@ -146,7 +146,7 @@
        { value: "reset", source: ["delay","trigger","join","rbe"] },
        { value: "responseCookies", source: ["http request"] },
        { value: "responseTopic", source: ["mqtt"] },
-        { value: "responseURL", source: ["http request"] },
+        { value: "responseUrl", source: ["http request"] },
        { value: "restartTimeout", source: ["join"] },
        { value: "retain", source: ["mqtt"] },
        { value: "schema", source: ["json"] },
@@ -501,7 +501,7 @@
                this.options.types = this.options.types||Object.keys(allOptions);
            }

-            this.selectTrigger = $('<button class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
+            this.selectTrigger = $('<button type="button" class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
            $('<i class="red-ui-typedInput-icon fa fa-caret-down"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);

            this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
@@ -570,7 +570,7 @@
            })

            // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
-            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
+            this.optionSelectTrigger = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
            this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
            // RED.popover.tooltip(this.optionSelectLabel,function() {
            //     return that.optionValue;
@@ -591,7 +591,7 @@
                that.uiSelect.addClass('red-ui-typedInput-focus');
            });

-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
+            this.optionExpandButton = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
            this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);

            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@@ -44,14 +44,10 @@ RED.contextMenu = (function () {
        const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
        const offset = $("#red-ui-workspace-chart").offset()

-        let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()
-        let addY = options.y - offset.top + $("#red-ui-workspace-chart").scrollTop()
-
-        if (RED.view.snapGrid) {
-            const gridSize = RED.view.gridSize()
-            addX = gridSize * Math.floor(addX / gridSize)
-            addY = gridSize * Math.floor(addY / gridSize)
-        }
+        // addX/addY must be the position in the workspace accounting for both scroll and scale
+        // The +5 is because we display the contextMenu -5,-5 to actual click position
+        let addX = (options.x + 5 - offset.left + $("#red-ui-workspace-chart").scrollLeft()) / RED.view.scale()
+        let addY = (options.y + 5 - offset.top + $("#red-ui-workspace-chart").scrollTop()) / RED.view.scale()

        const menuItems = [
            { onselect: 'core:show-action-list', onpostselect: function () { } },
@@ -67,6 +63,10 @@ RED.contextMenu = (function () {
                                splice: isSingleLink ? selection.links[0] : undefined,
                                // spliceMultiple: isMultipleLinks
                            })
+                        },
+                        onpostselect: function() {
+                            // ensure quick add dialog search input has focus
+                            $('#red-ui-type-search-input').trigger('focus')
                        }
                    },
                    (hasLinks) ? { // has least 1 wire selected
@@ -144,7 +144,7 @@ RED.contextMenu = (function () {
            ($(window).width() -MENU_WIDTH)) {
            direction = "left";
        }
-        
+
        menu = RED.menu.init({
            direction: direction,
            onpreselect: function() {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -45,11 +45,13 @@ RED.editor = (function() {
        var hasChanged;
        if (node.type.indexOf("subflow:")===0) {
            subflow = RED.nodes.subflow(node.type.substring(8));
-            isValid = subflow.valid;
-            hasChanged = subflow.changed;
-            if (isValid === undefined) {
-                isValid = validateNode(subflow);
+            if (subflow){
+                isValid = subflow.valid;
                hasChanged = subflow.changed;
+                if (isValid === undefined) {
+                    isValid = validateNode(subflow);
+                    hasChanged = subflow.changed;
+                }
            }
            validationErrors = validateNodeProperties(node, node._def.defaults, node);
            node.valid = isValid && validationErrors.length === 0;
@@ -238,6 +240,7 @@ RED.editor = (function() {
            var valid = validateNodeProperty(node, defaults, property,value);
            if (((typeof valid) === "string") || !valid) {
                input.addClass("input-error");
+                input.next(".red-ui-typedInput-container").addClass("input-error");
                if ((typeof valid) === "string") {
                    var tooltip = input.data("tooltip");
                    if (tooltip) {
@@ -250,6 +253,7 @@ RED.editor = (function() {
                }
            } else {
                input.removeClass("input-error");
+                input.next(".red-ui-typedInput-container").removeClass("input-error");
                var tooltip = input.data("tooltip");
                if (tooltip) {
                    input.data("tooltip", null);
@@ -1105,6 +1109,10 @@ RED.editor = (function() {
                if (editing_node) {
                    RED.sidebar.info.refresh(editing_node);
                    RED.sidebar.help.show(editing_node.type, false);
+                    //ensure focused element is NOT body (for keyboard scope to operate correctly)
+                    if (document.activeElement.tagName === 'BODY') {
+                        $('#red-ui-editor-stack').trigger('focus')
+                    }
                }
            }
        }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
@@ -100,7 +100,7 @@ RED.editor.codeEditor.monaco = (function() {
        "node-red-util": {package: "node-red", module: "util", path: "node-red/util.d.ts" },
        "node-red-func": {package: "node-red", module: "func", path: "node-red/func.d.ts" },
    }
-    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] ];
+    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] , knownModules["util"] ];

    const modulesCache = {};

@@ -764,7 +764,7 @@ RED.editor.codeEditor.monaco = (function() {

        
        if(!options.stateId && options.stateId !== false) {
-            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title).split("/").pop());
+            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title || "").split("/").pop());
        }
        var el = options.element || $("#"+options.id)[0];
        var toolbarRow = $("<div>").appendTo(el);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js
@@ -76,6 +76,9 @@ RED.editor.colorPicker = RED.colorPicker = (function() {
            var focusTarget = colorInput;
            colorInput.on("change", function (e) {
                var color = colorInput.val();
+                if (options.defaultValue && !color.match(/^([a-z]+|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})$/)) {
+                    color = options.defaultValue;
+                }
                colorHiddenInput.val(color).trigger('change');
                refreshDisplay(color);
            });
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -255,6 +255,9 @@
                        var currentExpression = expressionEditor.getValue();
                        var expr;
                        var usesContext = false;
+                        var usesEnv = false;
+                        var usesMoment = false;
+                        var usesClone = false;
                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                        $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                        try {
@@ -267,6 +270,18 @@
                                usesContext = true;
                                return null;
                            });
+                            expr.assign("env", function(name) {
+                                usesEnv = true;
+                                return null;
+                            });
+                            expr.assign("moment", function(name) {
+                                usesMoment = true;
+                                return null;
+                            });
+                            expr.assign("clone", function(name) {
+                                usesClone = true;
+                                return null;
+                            });
                        } catch(err) {
                            testResultEditor.setValue(RED._("expressionEditor.errors.invalid-expr",{message:err.message}),-1);
                            return;
@@ -284,6 +299,18 @@
                                testResultEditor.setValue(RED._("expressionEditor.errors.context-unsupported"),-1);
                                return;
                            }
+                            if (usesEnv) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.env-unsupported"),-1);
+                                return;
+                            }
+                            if (usesMoment) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.moment-unsupported"),-1);
+                                return;
+                            }
+                            if (usesClone) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.clone-unsupported"),-1);
+                                return;
+                            }

                            var formattedResult;
                            if (result !== undefined) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
@@ -235,6 +235,7 @@
            RED.editor.colorPicker.create({
                id: "red-ui-editor-node-color",
                value: color,
+                defaultValue: "#DDAA99",
                palette: recommendedColors,
                sortPalette: function (a, b) {return a.l - b.l;}
            }).appendTo(colorRow);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/group.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/group.js
@@ -101,6 +101,7 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-stroke",
                value: style.stroke || defaultGroupStyle.stroke || "#a4a4a4",
+                defaultValue: "#a4a4a4",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -112,6 +113,7 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-fill",
                value: style.fill || defaultGroupStyle.fill ||"none",
+                defaultValue: "none",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
@@ -129,6 +131,7 @@ RED.group = (function() {
            RED.editor.colorPicker.create({
                id:"node-input-style-color",
                value: style.color || defaultGroupStyle.color ||"#a4a4a4",
+                defaultValue: "#a4a4a4",
                palette: colorPalette,
                cellPerRow: colorCount,
                cellWidth: 16,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
@@ -491,7 +491,11 @@ RED.keyboard = (function() {
                okButton.attr("disabled",!valid);
            });

-            var scopeSelect = $('<select><option value="*" data-i18n="keyboard.global"></option><option value="red-ui-workspace" data-i18n="keyboard.workspace"></option></select>').appendTo(scope);
+            var scopeSelect = $('<select>'+
+                '<option value="*" data-i18n="keyboard.global"></option>'+
+                '<option value="red-ui-workspace" data-i18n="keyboard.workspace"></option>'+
+                '<option value="red-ui-editor-stack" data-i18n="keyboard.editor"></option>'+
+                '</select>').appendTo(scope);
            scopeSelect.i18n();
            if (object.scope === "workspace") {
                object.scope = "red-ui-workspace";
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/library.js
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette.js
@@ -175,9 +175,19 @@ RED.palette = (function() {
                    $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
                }

-                var safeType = type.replace(/'/g,"\\'");
+                const safeType = type.replace(/'/g,"\\'");
+                const wrapStr = function (str) {
+                    if(str.indexOf(' ') >= 0) {
+                        return '"' + str + '"'
+                    }
+                    return str
+                }

-                $('<button type="button" onclick="RED.search.show(\'type:'+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
+                $('<button type="button"; return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>')
+                    .appendTo(popOverContent)
+                    .on('click', function() {
+                        RED.search.show('type:' + wrapStr(safeType))
+                    })
                $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)

                $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
@@ -422,6 +432,7 @@ RED.palette = (function() {
                categoryNode.find(".red-ui-palette-content").slideToggle();
                categoryNode.find("i").toggleClass("expanded");
            }
+            categoryNode.hide();
        }
    }

@@ -500,6 +511,7 @@ RED.palette = (function() {
                    currentCategoryNode.find(".red-ui-palette-content").slideToggle();
                    currentCategoryNode.find("i").toggleClass("expanded");
                }
+                currentCategoryNode.hide();
            }
        }

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js
@@ -545,7 +545,7 @@ RED.projects = (function() {
                        var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.clone-project.ssh-key-desc")+'</div>').appendTo(sshwarningRow);
                        subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
                            e.preventDefault();
                            dialog.dialog( "close" );
                            RED.userSettings.show('gitconfig');
@@ -747,14 +747,14 @@ RED.projects = (function() {
                        var row = $('<div class="form-row"></div>').appendTo(body);
                        $('<label for="red-ui-projects-dialog-screen-create-project-file">'+RED._("projects.default-files.flow-file")+'</label>').appendTo(row);
                        var subrow = $('<div style="position:relative;"></div>').appendTo(row);
-                        var defaultFlowFile = (createProjectOptions.files &&createProjectOptions.files.flow) || (RED.settings.files && RED.settings.files.flow)||"flow.json";
+                        var defaultFlowFile = (createProjectOptions.files &&createProjectOptions.files.flow) || (RED.settings.files && RED.settings.files.flow) || "flows.json";
                        projectFlowFileInput = $('<input id="red-ui-projects-dialog-screen-create-project-file" type="text">').val(defaultFlowFile)
                            .on("change keyup paste",validateForm)
                            .appendTo(subrow);
                        $('<div class="red-ui-projects-dialog-screen-input-status"></div>').appendTo(subrow);
                        $('<label class="red-ui-projects-edit-form-sublabel"><small>*.json</small></label>').appendTo(row);

-                        var defaultCredentialsFile = (createProjectOptions.files &&createProjectOptions.files.credentials) || (RED.settings.files && RED.settings.files.credentials)||"flow_cred.json";
+                        var defaultCredentialsFile = (createProjectOptions.files &&createProjectOptions.files.credentials) || (RED.settings.files && RED.settings.files.credentials) || "flows_cred.json";
                        row = $('<div class="form-row"></div>').appendTo(body);
                        $('<label for="red-ui-projects-dialog-screen-create-project-credfile">'+RED._("projects.default-files.credentials-file")+'</label>').appendTo(row);
                        subrow = $('<div style="position:relative;"></div>').appendTo(row);
@@ -1171,11 +1171,11 @@ RED.projects = (function() {

                        row = $('<div class="form-row button-group"></div>').appendTo(container);

-                        var openProject = $('<button data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
-                        var createAsEmpty = $('<button data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
-                        // var createAsCopy = $('<button data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
-                        var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
-                        // var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
+                        var openProject = $('<button type="button" data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
+                        var createAsEmpty = $('<button type="button" data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
+                        // var createAsCopy = $('<button type="button" data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
+                        var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
+                        // var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
                        row.find(".red-ui-projects-dialog-screen-create-type").on("click", function(evt) {
                            evt.preventDefault();
                            container.find(".red-ui-projects-dialog-screen-create-type").removeClass('selected');
@@ -1257,7 +1257,7 @@ RED.projects = (function() {
                        row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-empty"></div>').appendTo(container);
                        $('<label for="red-ui-projects-dialog-screen-create-project-file">'+RED._("projects.create.flow-file")+'</label>').appendTo(row);
                        subrow = $('<div style="position:relative;"></div>').appendTo(row);
-                        projectFlowFileInput = $('<input id="red-ui-projects-dialog-screen-create-project-file" type="text">').val("flow.json")
+                        projectFlowFileInput = $('<input id="red-ui-projects-dialog-screen-create-project-file" type="text">').val("flows.json")
                            .on("change keyup paste",validateForm)
                            .appendTo(subrow);
                        $('<div class="red-ui-projects-dialog-screen-input-status"></div>').appendTo(subrow);
@@ -1271,7 +1271,7 @@ RED.projects = (function() {
                        var credentialsLeftBox = $('<div class="red-ui-projects-dialog-credentials-box-left">').appendTo(credentialsBox);

                        var credentialsEnabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-enabled"></div>').appendTo(credentialsLeftBox);
-                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled"> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
+                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled" checked> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
                        var credentialsDisabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-disabled disabled"></div>').appendTo(credentialsLeftBox);
                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="disabled"> <i class="fa fa-unlock"></i> <span>'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);

@@ -1397,7 +1397,7 @@ RED.projects = (function() {
                        var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                        $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.create.desc2")+'</div>').appendTo(sshwarningRow);
                        subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
                            e.preventDefault();
                            $('#red-ui-projects-dialog-cancel').trigger("click");
                            RED.userSettings.show('gitconfig');
@@ -1631,14 +1631,14 @@ RED.projects = (function() {
    function deleteProject(row,name,done) {
        var cover = $('<div class="red-ui-projects-dialog-project-list-entry-delete-confirm"></div>').on("click", function(evt) { evt.stopPropagation(); }).appendTo(row);
        $('<span>').text(RED._("projects.delete.confirm")).appendTo(cover);
-        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
+        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
            .appendTo(cover)
            .on("click", function(e) {
                e.stopPropagation();
                cover.remove();
                done(true);
            });
-        $('<button class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
+        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
            .appendTo(cover)
            .on("click", function(e) {
                e.stopPropagation();
@@ -1822,7 +1822,7 @@ RED.projects = (function() {
                header.addClass("selectable");

                var tools = $('<div class="red-ui-projects-dialog-project-list-entry-tools"></div>').appendTo(header);
-                $('<button class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
+                $('<button type="button" class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
                    .appendTo(tools)
                    .on("click", function(e) {
                        e.stopPropagation();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/search.js
@@ -106,38 +106,51 @@ RED.search = (function() {
        return val;
    }

-    function search(val) {
-        var results = [];
-        var typeFilter;
-        var m = /(?:^| )type:([^ ]+)/.exec(val);
-        if (m) {
-            val = val.replace(/(?:^| )type:[^ ]+/,"");
-            typeFilter = m[1];
+    function extractType(val, flags) {
+        // extracts:  type:XYZ  &  type:"X Y Z"
+        const regEx = /(?:type):\s*(?:"([^"]+)"|([^" ]+))/;
+        let m
+        while ((m = regEx.exec(val)) !== null) {
+            // avoid infinite loops with zero-width matches
+            if (m.index === regEx.lastIndex) {
+                regEx.lastIndex++;
+            }
+            val = val.replace(m[0]," ").trim()
+            const flag = m[2] || m[1] // quoted entries in capture group 1, unquoted in capture group 2
+            flags.type = flags.type || [];
+            flags.type.push(flag);
        }
-        var flags = {};
+        return val;
+    }
+
+    function search(val) {
+        const results = [];
+        const flags = {};
        val = extractFlag(val,"invalid",flags);
        val = extractFlag(val,"unused",flags);
        val = extractFlag(val,"config",flags);
        val = extractFlag(val,"subflow",flags);
        val = extractFlag(val,"hidden",flags);
        val = extractFlag(val,"modified",flags);
-        val = extractValue(val,"flow",flags);// flow:active or flow:<flow-id>
+        val = extractValue(val,"flow",flags);// flow:current or flow:<flow-id>
        val = extractValue(val,"uses",flags);// uses:<node-id>
+        val = extractType(val,flags);// type:<node-type>
        val = val.trim();
-        var hasFlags = Object.keys(flags).length > 0;
+        const hasFlags = Object.keys(flags).length > 0;
+        const hasTypeFilter = flags.type && flags.type.length > 0
        if (flags.flow && flags.flow.indexOf("current") >= 0) {
            let idx = flags.flow.indexOf("current");
-            flags.flow[idx] = RED.workspaces.active();//convert active to flow ID
+            flags.flow[idx] = RED.workspaces.active();//convert 'current' to active flow ID
        }
        if (flags.flow && flags.flow.length) {
            flags.flow = [ ...new Set(flags.flow) ]; //deduplicate
        }
-        if (val.length > 0 || typeFilter || hasFlags) {
+        if (val.length > 0 || hasFlags) {
            val = val.toLowerCase();
-            var i;
-            var j;
-            var list = [];
-            var nodes = {};
+            let i;
+            let j;
+            let list = [];
+            const nodes = {};
            let keys = [];
            if (flags.uses) {
                keys = flags.uses;
@@ -145,10 +158,10 @@ RED.search = (function() {
                keys = Object.keys(index);
            }
            for (i=0;i<keys.length;i++) {
-                var key = keys[i];
-                var kpos = keys[i].indexOf(val);
-                if (kpos > -1) {
-                    var ids = Object.keys(index[key]||{});
+                const key = keys[i];
+                const kpos = val ? keys[i].indexOf(val) : -1;
+                if (kpos > -1 || (val === "" && hasFlags)) {
+                    const ids = Object.keys(index[key]||{});
                    for (j=0;j<ids.length;j++) {
                        var node = index[key][ids[j]];
                        var isConfigNode = node.node._def.category === "config" && node.node.type !== 'group';
@@ -156,7 +169,7 @@ RED.search = (function() {
                            continue;
                        }
                        if (flags.hasOwnProperty("invalid")) {
-                            var nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
+                            const nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
                            if (flags.invalid === nodeIsValid) {
                                continue;
                            }
@@ -186,8 +199,8 @@ RED.search = (function() {
                            }
                        }
                        if (flags.hasOwnProperty("unused")) {
-                            var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
-                                           (isConfigNode && node.node.users.length === 0)
+                            const isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
+                                           (isConfigNode && node.node.users.length === 0 && node.node._def.hasUsers !== false)
                            if (flags.unused !== isUnused) {
                                continue;
                            }
@@ -197,12 +210,16 @@ RED.search = (function() {
                                continue;
                            }
                        }
-                        if (!typeFilter || node.node.type === typeFilter) {
-                            nodes[node.node.id] = nodes[node.node.id] = {
+                        let typeIndex = -1
+                        if(hasTypeFilter) {
+                            typeIndex = flags.type.indexOf(node.node.type)
+                        }
+                        if (!hasTypeFilter || typeIndex > -1) {
+                            nodes[node.node.id] = nodes[node.node.id] || {
                                node: node.node,
                                label: node.label
                            };
-                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index||Infinity,kpos);
+                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index || Infinity, typeIndex > -1 ? typeIndex : kpos);
                        }
                    }
                }
@@ -538,7 +555,7 @@ RED.search = (function() {
                $(previousActiveElement).trigger("focus");
            }
            previousActiveElement = null;
-        } 
+        }
        if(!keepSearchToolbar) {
            clearActiveSearch();
        }
@@ -630,7 +647,7 @@ RED.search = (function() {
        $("#red-ui-sidebar-shade").on('mousedown',hide);

        $("#red-ui-view-searchtools-close").on("click", function close() {
-            clearActiveSearch();            
+            clearActiveSearch();
            updateSearchToolbar();
        });
        $("#red-ui-view-searchtools-close").trigger("click");
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -506,6 +506,13 @@ RED.subflow = (function() {
        RED.nodes.groups(id).forEach(function(n) {
            removedGroups.push(n);
        })
+
+        var removedJunctions = RED.nodes.junctions(id)
+        for (var i=0;i<removedJunctions.length;i++) {
+            var removedEntities = RED.nodes.removeJunction(removedJunctions[i])
+            removedLinks = removedLinks.concat(removedEntities.links)
+        }
+
        var removedConfigNodes = [];
        for (var i=0;i<removedNodes.length;i++) {
            var removedEntities = RED.nodes.remove(removedNodes[i].id);
@@ -536,6 +543,7 @@ RED.subflow = (function() {
            nodes:removedNodes,
            links:removedLinks,
            groups: removedGroups,
+            junctions: removedJunctions,
            subflows: [activeSubflow]
        }
    }
@@ -655,24 +663,23 @@ RED.subflow = (function() {
        var candidateOutputs = [];
        var candidateInputNodes = {};

-        var boundingBox = [nodeList[0].x,
-            nodeList[0].y,
-            nodeList[0].x,
-            nodeList[0].y];
+        var boundingBox = [nodeList[0].x-(nodeList[0].w/2),
+            nodeList[0].y-(nodeList[0].h/2),
+            nodeList[0].x+(nodeList[0].w/2),
+            nodeList[0].y+(nodeList[0].h/2)];

        for (i=0;i<nodeList.length;i++) {
            n = nodeList[i];
            nodes[n.id] = {n:n,outputs:{}};
            boundingBox = [
-                Math.min(boundingBox[0],n.x),
-                Math.min(boundingBox[1],n.y),
-                Math.max(boundingBox[2],n.x),
-                Math.max(boundingBox[3],n.y)
+                Math.min(boundingBox[0],n.x-(n.w/2)),
+                Math.min(boundingBox[1],n.y-(n.h/2)),
+                Math.max(boundingBox[2],n.x+(n.w/2)),
+                Math.max(boundingBox[3],n.y+(n.h/2))
            ]
        }
-        var offsetX = snapToGrid(boundingBox[0] - 200);
-        var offsetY = snapToGrid(boundingBox[1] - 80);
-
+        var offsetX = snapToGrid(boundingBox[0] - 140);
+        var offsetY = snapToGrid(boundingBox[1] - 60);

        var center = [
            snapToGrid((boundingBox[2]+boundingBox[0]) / 2),
@@ -932,7 +939,6 @@ RED.subflow = (function() {


    function buildEnvUIRow(row, tenv, ui, node) {
-        console.log(tenv, ui)
        ui.label = ui.label||{};
        if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
            ui.type = "cred";
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
@@ -50,7 +50,7 @@ RED.sidebar.help = (function() {

        tocPanel = $("<div>", {class: "red-ui-sidebar-help-toc"}).appendTo(stackContainer);
        var helpPanel = $("<div>").css({
-            "overflow-y": "scroll"
+            "overflow-y": "auto"
        }).appendTo(stackContainer);

        panels = RED.panels.create({
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js
@@ -135,6 +135,10 @@ RED.sidebar.info.outliner = (function() {
                    RED.workspaces.show(n.id, null, true);
                }
            });
+            RED.popover.tooltip(toggleVisibleButton, function () {
+                var isHidden = !div.hasClass("red-ui-info-outline-item-hidden");
+                return RED._("sidebar.info." + (isHidden ? "hideFlow" : "showFlow"));
+            });
        }
        if (n.type !== 'subflow') {
            var toggleButton = $('<button type="button" class="red-ui-info-outline-item-control-disable red-ui-button red-ui-button-small"><i class="fa fa-circle-thin"></i><i class="fa fa-ban"></i></button>').appendTo(controls).on("click",function(evt) {
@@ -613,6 +617,9 @@ RED.sidebar.info.outliner = (function() {
                objects[n.id].children = missingParents[n.id];
                delete missingParents[n.id]
            }
+            if (objects[n.id].children.length === 0) {
+                objects[n.id].children.push(getEmptyItem(n.id));
+            }
        }
        var parent = n.g||n.z||"__global__";

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -98,7 +98,7 @@ RED.sidebar.info = (function() {

        propertiesPanelContent = $("<div>").css({
            "flex":"1 1 auto",
-            "overflow-y":"scroll",
+            "overflow-y":"auto",
        }).appendTo(propertiesPanel);


--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@@ -269,8 +269,8 @@ RED.typeSearch = (function() {
        moveCallback = opts.move;
        RED.events.emit("type-search:open");
        //shade.show();
-        if ($("#red-ui-main-container").height() - opts.y - 150 < 0) {
-            opts.y = opts.y - 235;
+        if ($("#red-ui-main-container").height() - opts.y - 195 < 0) {
+            opts.y = opts.y - 275;
        }
        dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
        searchResultsDiv.slideDown(300);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js
@@ -1015,7 +1015,7 @@ RED.view.tools = (function() {
                const nodeDef = n._def || RED.nodes.getType(n.type)
                if (nodeDef && nodeDef.defaults && nodeDef.defaults.name) {
                    const paletteLabel = RED.utils.getPaletteLabel(n.type, nodeDef)
-                    const defaultNodeNameRE = new RegExp('^'+paletteLabel+' (\\d+)$')
+                    const defaultNodeNameRE = new RegExp('^'+paletteLabel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')+' (\\d+)$')
                    if (!typeIndex.hasOwnProperty(n.type)) {
                        const existingNodes = RED.nodes.filterNodes({type: n.type})
                        let maxNameNumber = 0;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -586,11 +586,28 @@ RED.view = (function() {

                var group = $(ui.helper).data("group");
                if (group) {
+                    var oldX = group.x; 
+                    var oldY = group.y; 
                    RED.group.addToGroup(group, nn);
+                    var moveEvent = null;
+                    if ((group.x !== oldX) ||
+                        (group.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: group,
+                                     ox: oldX, oy: oldY,
+                                     dx: group.x -oldX,
+                                     dy: group.y -oldY}],
+                            dirty: true
+                        };
+                    }
                    historyEvent = {
                        t: 'multi',
                        events: [historyEvent],

+                    };
+                    if (moveEvent) {
+                        historyEvent.events.push(moveEvent)
                    }
                    historyEvent.events.push({
                        t: "addToGroup",
@@ -1071,12 +1088,15 @@ RED.view = (function() {
            RED.view.redraw();
        }

+        // `point` is the place in the workspace the mouse has clicked.
+        //  This takes into account scrolling and scaling of the workspace.
        var ox = point[0];
        var oy = point[1];

+        // Need to map that to browser location to position the pop-up
        const offset = $("#red-ui-workspace-chart").offset()
-        var clientX = ox + offset.left - $("#red-ui-workspace-chart").scrollLeft()
-        var clientY = oy + offset.top - $("#red-ui-workspace-chart").scrollTop()
+        var clientX = (ox * scaleFactor) + offset.left - $("#red-ui-workspace-chart").scrollLeft()
+        var clientY = (oy * scaleFactor) + offset.top - $("#red-ui-workspace-chart").scrollTop()

        if (RED.settings.get("editor").view['view-snap-grid']) {
            // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
@@ -1347,19 +1367,35 @@ RED.view = (function() {
                RED.editor.validateNode(nn);

                if (targetGroup) {
+                    var oldX = targetGroup.x; 
+                    var oldY = targetGroup.y; 
                    RED.group.addToGroup(targetGroup, nn);
+                    var moveEvent = null;
+                    if ((targetGroup.x !== oldX) ||
+                        (targetGroup.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: targetGroup,
+                                     ox: oldX, oy: oldY,
+                                     dx: targetGroup.x -oldX,
+                                     dy: targetGroup.y -oldY}],
+                            dirty: true
+                        };
+                    }
                    if (historyEvent.t !== "multi") {
                        historyEvent = {
                            t:'multi',
                            events: [historyEvent]
-                        }
+                        };
                    }
                    historyEvent.events.push({
                        t: "addToGroup",
                        group: targetGroup,
                        nodes: nn
-                    })
-
+                    });
+                    if (moveEvent) {
+                        historyEvent.events.push(moveEvent);
+                    }
                }

                if (spliceLink) {
@@ -1695,6 +1731,7 @@ RED.view = (function() {

            // Check link splice or group-add
            if (movingSet.length() === 1 && movingSet.get(0).n.type !== "group") {
+            //}{//NIS
                node = movingSet.get(0);
                if (spliceActive) {
                    if (!spliceTimer) {
@@ -2054,11 +2091,25 @@ RED.view = (function() {
        if (mouse_mode == RED.state.MOVING_ACTIVE) {
            if (movingSet.length() > 0) {
                var addedToGroup = null;
+                var moveEvent = null;
                if (activeHoverGroup) {
+                    var oldX = activeHoverGroup.x; 
+                    var oldY = activeHoverGroup.y; 
                    for (var j=0;j<movingSet.length();j++) {
                        var n = movingSet.get(j);
                        RED.group.addToGroup(activeHoverGroup,n.n);
                    }
+                    if ((activeHoverGroup.x !== oldX) ||
+                        (activeHoverGroup.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: activeHoverGroup,
+                                     ox: oldX, oy: oldY,
+                                     dx: activeHoverGroup.x -oldX,
+                                     dy: activeHoverGroup.y -oldY}],
+                            dirty: true
+                        };
+                    }
                    addedToGroup = activeHoverGroup;

                    activeHoverGroup.hovered = false;
@@ -2104,6 +2155,12 @@ RED.view = (function() {
                        historyEvent.addToGroup = addedToGroup;
                    }
                    RED.nodes.dirty(true);
+                    if (moveEvent) {
+                        historyEvent = {
+                            t: "multi",
+                            events: [moveEvent, historyEvent]
+                        };
+                    }
                    RED.history.push(historyEvent);
                }
            }
@@ -2589,6 +2646,16 @@ RED.view = (function() {
                        var result = RED.nodes.removeJunction(node)
                        removedJunctions.push(node);
                        removedLinks = removedLinks.concat(result.links);
+                        if (node.g) {
+                            var group = RED.nodes.group(node.g);
+                            if (selectedGroups.indexOf(group) === -1) {
+                                // Don't use RED.group.removeFromGroup as that emits
+                                // a change event on the node - but we're deleting it
+                                var index = group.nodes.indexOf(node);
+                                group.nodes.splice(index,1);
+                                RED.group.markDirty(group);
+                            }
+                        }
                    } else {
                        if (node.direction === "out") {
                            removedSubflowOutputs.push(node);
@@ -3366,6 +3433,9 @@ RED.view = (function() {
        }
        if (dblClickPrimed && mousedown_node == d && clickElapsed > 0 && clickElapsed < dblClickInterval) {
            mouse_mode = RED.state.DEFAULT;
+            // Avoid dbl click causing text selection.
+            d3.event.preventDefault()
+            document.getSelection().removeAllRanges()
            if (d.type != "subflow") {
                if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
                    RED.workspaces.show(d.type.substring(8));
@@ -3460,11 +3530,25 @@ RED.view = (function() {
                updateActiveNodes();
            }

+            var moveEvent = null;
            if (activeHoverGroup) {
+                var oldX = activeHoverGroup.x; 
+                var oldY = activeHoverGroup.y; 
                for (var j=0;j<movingSet.length();j++) {
                    var n = movingSet.get(j);
                    RED.group.addToGroup(activeHoverGroup,n.n);
                }
+                if ((activeHoverGroup.x !== oldX) ||
+                    (activeHoverGroup.y !== oldY)) {
+                    moveEvent = {
+                        t: "move",
+                        nodes: [{n: activeHoverGroup,
+                                 ox: oldX, oy: oldY,
+                                 dx: activeHoverGroup.x -oldX,
+                                 dy: activeHoverGroup.y -oldY}],
+                        dirty: true
+                    };
+                }
                historyEvent.addedToGroup = activeHoverGroup;

                activeHoverGroup.hovered = false;
@@ -3473,7 +3557,6 @@ RED.view = (function() {
                activeGroup.selected = true;
                activeHoverGroup = null;
            }
-
            if (mouse_mode == RED.state.DETACHED_DRAGGING) {
                var ns = [];
                for (var j=0;j<movingSet.length();j++) {
@@ -3484,7 +3567,15 @@ RED.view = (function() {
                        n.n.moved = true;
                    }
                }
-                RED.history.replace({t:"multi",events:[historyEvent,{t:"move",nodes:ns}],dirty: historyEvent.dirty})
+                var event = {t:"multi",events:[historyEvent,{t:"move",nodes:ns}],dirty: historyEvent.dirty};
+                if (moveEvent) {
+                    event.events.push(moveEvent);
+                }
+                RED.history.replace(event)
+            }
+            else if(moveEvent) {
+                var event = {t:"multi", events:[historyEvent, moveEvent], dirty: true};
+                RED.history.replace(event);
            }

            updateSelection();
@@ -4906,7 +4997,7 @@ RED.view = (function() {
                        if (d._def.button) {
                            var buttonEnabled = isButtonEnabled(d);
                            this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-disabled", !buttonEnabled);
-                            if (RED.runtime && Object.hasOwn(RED.runtime,'started')) {
+                            if (RED.runtime && RED.runtime.started !== undefined) {
                                this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-stopped", !RED.runtime.started);
                            }

--- a/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/debug.scss
@@ -30,7 +30,7 @@
    bottom: 0px;
    left:0px;
    right: 0px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-debug-filter-box {
    position:absolute;
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -124,7 +124,7 @@
    list-style-type: none;
    margin: 0;
    padding:0;
-
+    overflow-wrap: anywhere;
    li {
        display: inline-block;
        padding:0;
@@ -368,7 +368,7 @@ button.red-ui-button-small
    border:1px solid var(--red-ui-secondary-border-color);
    border-radius:5px;
    height: calc(100% - 21px);
-    overflow-y: scroll;
+    overflow-y: auto;
    background: var(--red-ui-secondary-background);
 }

@@ -562,7 +562,7 @@ div.red-ui-button-small.red-ui-color-picker-opacity-slider-handle {
 .red-ui-icon-list {
    width: 308px;
    height: 200px;
-    overflow-y: scroll;
+    overflow-y: auto;
    line-height: 0px;
    position: relative;
    &.red-ui-icon-list-dark {
--- a/packages/node_modules/@node-red/editor-client/src/sass/notifications.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/notifications.scss
@@ -32,7 +32,8 @@
    color: var(--red-ui-primary-text-color);
    border: 1px solid var(--red-ui-notification-border-default);
    border-left-width: 16px;
-    overflow: hidden;
+    overflow: auto;
+    max-height: 80vh;
    .ui-dialog-buttonset {
        margin-top: 20px;
        margin-bottom: 10px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
@@ -55,7 +55,7 @@
 .red-ui-palette-search {
    position: relative;
    overflow: hidden;
-    background: var(--red-ui-secondary-background);
+    background: var(--red-ui-form-input-background);
    text-align: center;
    height: 35px;
    padding: 3px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/popover.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/popover.scss
@@ -35,6 +35,7 @@
    padding: 8px;
    border-radius: 2px;
    background: var(--red-ui-popover-background);
+    overflow-wrap: anywhere;
 }
 .red-ui-popover:after, .red-ui-popover:before {
    border: solid transparent;
--- a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
@@ -26,7 +26,7 @@
    }
 }
 #red-ui-project-settings-tab-settings {
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-sidebar-vc-shade {
    background: var(--red-ui-primary-background);
@@ -183,7 +183,7 @@
 }
 .red-ui-projects-dialog-project-list-inner-container {
    flex-grow: 1 ;
-    overflow-y: scroll;
+    overflow-y: auto;
    position:relative;
    .red-ui-editableList-border {
        border: none;
--- a/packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss
@@ -41,6 +41,7 @@
    height: 50px;
    background: var(--red-ui-secondary-background);
    border: 2px solid var(--red-ui-primary-border-color);
+    color: var(--red-ui-primary-text-color);
    text-align: center;
    line-height:50px;

@@ -51,7 +52,7 @@

 .red-ui-editor-radial-menu-opt-disabled {
    border-color: var(--red-ui-tertiary-border-color);
-    color: var(--red-ui-tertiary-border-color);
+    color: var(--red-ui-secondary-text-color-disabled);
 }
 .red-ui-editor-radial-menu-opt-active {
    background: var(--red-ui-secondary-background-hover);
--- a/packages/node_modules/@node-red/editor-client/src/sass/search.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/search.scss
@@ -108,6 +108,8 @@
    }
    .red-ui-search-result-node-label {
        color: var(--red-ui-secondary-text-color);
+        width: 240px;
+        overflow-wrap: anywhere;
    }
 }

--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss
@@ -20,7 +20,7 @@
    bottom: 0;
    left: 0;
    right: 0;
-    overflow-y: scroll;
+    overflow-y: auto;

    .red-ui-palette-category {
        &:not(.expanded) button {
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
@@ -31,6 +31,7 @@
    > span {
        display: inline-block;
        margin-left: 5px;
+        overflow-wrap: anywhere;
    }
    border-bottom: 1px solid var(--red-ui-secondary-border-color);
 }
--- a/packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss
@@ -67,7 +67,7 @@
    left: 0;
    bottom: 0;
    padding: 8px 20px 20px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-settings-row {
    padding: 5px 10px 2px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
@@ -29,7 +29,7 @@
 #red-ui-workspace-chart {
   overflow: auto;
   position: absolute;
-   bottom:25px;
+   bottom:26px;
   top: 35px;
   left:0px;
   right:0px;
--- a/packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts
+++ b/packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts
@@ -14,6 +14,9 @@ declare var msg: NodeMessage;
 /** @type {string} the id of the incoming `msg` (alias of msg._msgid) */
 declare const __msgid__:string;

+declare const util:typeof import('util')
+declare const promisify:typeof import('util').promisify
+
 /**
 * @typedef NodeStatus
 * @type {object}
--- a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
+++ b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
@@ -160,6 +160,7 @@
        '$base64encode':{ args:[  ]},
        '$boolean':{ args:[ 'arg' ]},
        '$ceil':{ args:[ 'number' ]},
+        '$clone': { args:[ 'arg' ]},
        '$contains':{ args:[ 'str', 'pattern' ]},
        '$count':{ args:[ 'array' ]},
        '$decodeUrl':{ args:[ 'str' ]},
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.js
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
@@ -95,45 +95,64 @@ module.exports = function(RED) {
        }

        this.on("input", function(msg, send, done) {
-            var errors = [];
-            var props = this.props;
+            const errors = [];
+            let props = this.props;
            if (msg.__user_inject_props__ && Array.isArray(msg.__user_inject_props__)) {
                props = msg.__user_inject_props__;
            }
            delete msg.__user_inject_props__;
-            props.forEach(p => {
-                var property = p.p;
-                var value = p.v ? p.v : '';
-                var valueType = p.vt ? p.vt : 'str';
+            props = [...props]
+            function evaluateProperty(doneEvaluating) {
+                if (props.length === 0) { 
+                    doneEvaluating()
+                    return
+                }
+                const p = props.shift()
+                const property = p.p;
+                const value = p.v ? p.v : '';
+                const valueType = p.vt ? p.vt : 'str';

-                if (!property) return;
-
-                if (valueType === "jsonata") {
-                    if (p.v) {
-                        try {
-                            var exp = RED.util.prepareJSONataExpression(p.v, node);
-                            var val = RED.util.evaluateJSONataExpression(exp, msg);
-                            RED.util.setMessageProperty(msg, property, val, true);
+                if (property) {
+                    if (valueType === "jsonata") {
+                        if (p.v) {
+                            try {
+                                var exp = RED.util.prepareJSONataExpression(p.v, node);
+                                var val = RED.util.evaluateJSONataExpression(exp, msg);
+                                RED.util.setMessageProperty(msg, property, val, true);
+                            }
+                            catch  (err) {
+                                errors.push(err.message);
+                            }
                        }
-                        catch  (err) {
-                            errors.push(err.message);
+                        evaluateProperty(doneEvaluating)
+                    } else {
+                        try {
+                            RED.util.evaluateNodeProperty(value, valueType, node, msg, (err, newValue) => {
+                                if (err) {
+                                    errors.push(err.toString())
+                                } else {
+                                    RED.util.setMessageProperty(msg,property,newValue,true);
+                                }
+                                evaluateProperty(doneEvaluating)
+                            })
+                        } catch (err) {
+                            errors.push(err.toString());
+                            evaluateProperty(doneEvaluating)
                        }
                    }
-                    return;
+                } else {
+                    evaluateProperty(doneEvaluating)
                }
-                try {
-                    RED.util.setMessageProperty(msg,property,RED.util.evaluateNodeProperty(value, valueType, this, msg),true);
-                } catch (err) {
-                    errors.push(err.toString());
-                }
-            });
-
-            if (errors.length) {
-                done(errors.join('; '));
-            } else {
-                send(msg);
-                done();
            }
+           
+            evaluateProperty(() => {
+                if (errors.length) {
+                    done(errors.join('; '));
+                } else {
+                    send(msg);
+                    done();
+                }
+            })
        });
    }

--- a/packages/node_modules/@node-red/nodes/core/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
@@ -1,6 +1,6 @@
 <script type="text/html" data-template-name="complete">
    <div class="form-row node-input-target-row">
-        <button id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
    </div>
    <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
        <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-complete-target-filter"></div>
@@ -18,7 +18,16 @@
        color:"#c0edc0",
        defaults: {
            name: {value:""},
-            scope: {value:[], type:"*[]"},
+            scope: {
+                value: [],
+                type: "*[]",
+                validate: function (v, opt) {
+                    if (v.length > 0) {
+                        return true;
+                    }
+                    return RED._("node-red:complete.errors.scopeUndefined");
+                }
+            },
            uncaught: {value:false}
        },
        inputs:0,
--- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
@@ -4,7 +4,7 @@
        <label style="width: auto" for="node-input-scope" data-i18n="catch.label.source"></label>
        <select id="node-input-scope-select">
            <option value="all" data-i18n="catch.scope.all"></option>
-            <option value="target" data-i18n="catch.scope.selected"></options>
+            <option value="target" data-i18n="catch.scope.selected"></option>
        </select>
    </div>
    <div class="form-row node-input-uncaught-row">
@@ -12,7 +12,7 @@
        <label for="node-input-uncaught" style="width: auto" data-i18n="catch.label.uncaught"></label>
    </div>
    <div class="form-row node-input-target-row">
-        <button id="node-input-catch-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-catch-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
    </div>
    <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
        <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-catch-target-filter"></div>
--- a/packages/node_modules/@node-red/nodes/core/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -4,11 +4,11 @@
        <label style="width: auto" for="node-input-scope" data-i18n="status.label.source"></label>
        <select id="node-input-scope-select">
            <option value="all" data-i18n="status.scope.all"></option>
-            <option value="target" data-i18n="status.scope.selected"></options>
+            <option value="target" data-i18n="status.scope.selected"></option>
        </select>
    </div>
    <div class="form-row node-input-target-row">
-        <button id="node-input-status-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-status-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
    </div>
    <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
        <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-status-target-filter"></div>
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html
@@ -1,4 +1,3 @@
-
 <script type="text/html" data-template-name="link in">
    <div class="form-row">
        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -272,7 +271,17 @@
        color:"#ddd",//"#87D8CF",
        defaults: {
            name: { value: "" },
-            links: { value: [], type:"link in[]" },
+            links: {
+                value: [],
+                type: "link in[]",
+                validate: function (v, opt) {
+                    if ((this.linkType === "static" && v.length > 0)
+                      || this.linkType === "dynamic") {
+                        return true;
+                    }
+                    return RED._("node-red:link.errors.linkUndefined");
+                }
+            },
            linkType: { value:"static" },
            timeout: {
                value: "30",
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.js
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.js
@@ -164,10 +164,10 @@ module.exports = function(RED) {
                    if (returnNode && returnNode.returnLinkMessage) {
                        returnNode.returnLinkMessage(messageEvent.id, msg);
                    } else {
-                        node.warn(RED._("link.error.missingReturn"))
+                        node.warn(RED._("link.errors.missingReturn"));
                    }
                } else {
-                    node.warn(RED._("link.error.missingReturn"))
+                    node.warn(RED._("link.errors.missingReturn"));
                }
                done();
            } else if (mode === "link") {
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -17,6 +17,8 @@
            display: flex;
            background: var(--red-ui-tertiary-background);
            padding-right: 75px;
+            border-top-left-radius: 3px;
+            border-top-right-radius: 3px;
        }
        #node-input-libs-container-row .red-ui-editableList-header > div {
            flex-grow: 1;
@@ -91,21 +93,21 @@
        <div id="func-tab-init" style="display:none">
            <div class="form-row node-text-editor-row" style="position:relative">
                <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-init-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

        <div id="func-tab-body" style="display:none">
            <div class="form-row node-text-editor-row" style="position:relative">
                <div style="height: 220px; min-height:150px;" class="node-text-editor" id="node-input-func-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

        <div id="func-tab-finalize" style="display:none">
            <div class="form-row node-text-editor-row" style="position:relative">
                <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-finalize-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

@@ -294,7 +296,7 @@
                    if (val === "_custom_") {
                        val = $(this).val();
                    }
-                    var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
+                    var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/\.].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
                    fvar.val(varName);
                    fvar.trigger("change");

@@ -451,11 +453,13 @@
            tabs.activateTab("func-tab-body");

            $( "#node-input-outputs" ).spinner({
-                min:0,
+                min: 0,
+                max: 500,
                change: function(event, ui) {
-                    var value = this.value;
-                    if (!value.match(/^\d+$/)) { value = 1;  }
-                    else if (value < this.min) { value = this.min; }
+                    var value = parseInt(this.value);
+                    value = isNaN(value) ? 1 : value;
+                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
                    if (value !== this.value) { $(this).spinner("value", value); }
                }
            });
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -318,7 +318,7 @@ module.exports = function(RED) {
            }
            var r = node.rules[currentRule];
            if (r.t === "move") {
-                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
+                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1) && (r.p !== r.to)) {
                    applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
                        applyRule(msg,{t:"delete", p:r.p, pt:r.pt}, (err,msg) => {
                            completeApplyingRules(msg,currentRule,done);
--- a/packages/node_modules/@node-red/nodes/core/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/core/function/80-template.html
@@ -21,12 +21,13 @@
                <option value="javascript">JavaScript</option>
                <option value="css">CSS</option>
                <option value="markdown">Markdown</option>
+                <option value="php">PHP</option>
                <option value="python">Python</option>
                <option value="sql">SQL</option>
                <option value="yaml">YAML</option>
                <option value="text" data-i18n="template.label.none"></option>
            </select>
-            <button id="node-template-expand-editor" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button>
+            <button type="button" id="node-template-expand-editor" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button>
        </div>
    </div>
    <div class="form-row node-text-editor-row">
--- a/packages/node_modules/@node-red/nodes/core/function/rbe.js
+++ b/packages/node_modules/@node-red/nodes/core/function/rbe.js
@@ -35,7 +35,11 @@ module.exports = function(RED) {
                }
                else { node.previous = {}; }
            }
-            var value = RED.util.getMessageProperty(msg,node.property);
+            var value;
+            try {
+                value = RED.util.getMessageProperty(msg,node.property);
+            }
+            catch(e) { }
            if (value !== undefined) {
                var t = "_no_topic";
                if (node.septopics) { t = topic || t; }
--- a/packages/node_modules/@node-red/nodes/core/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/core/network/05-tls.html
@@ -25,7 +25,7 @@
            <label class="red-ui-button" for="node-config-input-certfile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
            <input class="hide" type="file" id="node-config-input-certfile">
            <span id="tls-config-certname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-cert-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-cert-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
        </span>
        <input type="hidden" id="node-config-input-certname">
        <input type="hidden" id="node-config-input-certdata">
@@ -37,7 +37,7 @@
            <label class="red-ui-button" for="node-config-input-keyfile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
            <input class="hide" type="file" id="node-config-input-keyfile">
            <span id="tls-config-keyname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-key-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-key-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
        </span>
        <input type="hidden" id="node-config-input-keyname">
        <input type="hidden" id="node-config-input-keydata">
@@ -53,7 +53,7 @@
            <label class="red-ui-button" for="node-config-input-cafile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
            <input class="hide" type="file" title=" " id="node-config-input-cafile">
            <span id="tls-config-caname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-ca-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-ca-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
        </span>
        <input type="hidden" id="node-config-input-caname">
        <input type="hidden" id="node-config-input-cadata">
--- a/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html
@@ -101,6 +101,7 @@
                            hostField.val(data.host);
                        }
                    },
+                    sortable: true,
                    removable: true
                });
            if (this.noproxy) {
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -421,7 +421,11 @@
 <script type="text/javascript">
 (function() {

-    var typedInputNoneOpt = { value: 'none', label: '', hasValue: false };
+    var typedInputNoneOpt = {
+        value: 'none',
+        label: RED._("node-red:mqtt.label.none"),
+        hasValue: false
+    };
    var makeTypedInputOpt = function(value){
        return {
            value: value,
@@ -436,7 +440,11 @@
        makeTypedInputOpt("text/csv"),
        makeTypedInputOpt("text/html"),
        makeTypedInputOpt("text/plain"),
-        {value:"other", label:""}
+        {
+            value: "other",
+            label: RED._("node-red:mqtt.label.other"),
+            icon: "red/images/typedInput/az.svg"
+        }
    ];

    function getDefaultContentType(value) {
@@ -499,17 +507,17 @@
            cleansession: {value: true},
            birthTopic: {value:"", validate:validateMQTTPublishTopic},
            birthQos: {value:"0"},
-            birthRetain: {value:false},
+            birthRetain: {value:"false"},
            birthPayload: {value:""},
            birthMsg: { value: {}},
            closeTopic: {value:"", validate:validateMQTTPublishTopic},
            closeQos: {value:"0"},
-            closeRetain: {value:false},
+            closeRetain: {value:"false"},
            closePayload: {value:""},
            closeMsg: { value: {}},
            willTopic: {value:"", validate:validateMQTTPublishTopic},
            willQos: {value:"0"},
-            willRetain: {value:false},
+            willRetain: {value:"false"},
            willPayload: {value:""},
            willMsg: { value: {}},
            userProps: { value: ""},
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -295,7 +295,7 @@ module.exports = function(RED) {
                        /* mute error - it simply isnt JSON, just leave payload as a string */
                    }
                }
-            } //else { 
+            } //else {
                //leave as buffer
            //}
        }
@@ -357,7 +357,7 @@ module.exports = function(RED) {
                        return;
                    }
                    done(err);
-                }); 
+                });
            } else {
                done();
            }
@@ -366,6 +366,16 @@ module.exports = function(RED) {
        }
    }

+    function updateStatus(node, allNodes) {
+        let setStatus = setStatusDisconnected
+        if(node.connecting) {
+            setStatus = setStatusConnecting
+        } else if(node.connected) {
+            setStatus = setStatusConnected
+        }
+        setStatus(node, allNodes)
+    }
+
    function setStatusDisconnected(node, allNodes) {
        if(allNodes) {
            for (var id in node.users) {
@@ -459,7 +469,6 @@ module.exports = function(RED) {
            if(!opts || typeof opts !== "object") {
                return; //nothing to change, simply return
            }
-            const originalBrokerURL = node.brokerurl;

            //apply property changes (only if the property exists in the opts object)
            setIfHasProperty(opts, node, "url", init);
@@ -468,13 +477,11 @@ module.exports = function(RED) {
            setIfHasProperty(opts, node, "clientid", init);
            setIfHasProperty(opts, node, "autoConnect", init);
            setIfHasProperty(opts, node, "usetls", init);
-            setIfHasProperty(opts, node, "usews", init);
            setIfHasProperty(opts, node, "verifyservercert", init);
            setIfHasProperty(opts, node, "compatmode", init);
            setIfHasProperty(opts, node, "protocolVersion", init);
            setIfHasProperty(opts, node, "keepalive", init);
            setIfHasProperty(opts, node, "cleansession", init);
-            setIfHasProperty(opts, node, "sessionExpiry", init);
            setIfHasProperty(opts, node, "topicAliasMaximum", init);
            setIfHasProperty(opts, node, "maximumPacketSize", init);
            setIfHasProperty(opts, node, "receiveMaximum", init);
@@ -484,6 +491,11 @@ module.exports = function(RED) {
            } else if (hasProperty(opts, "userProps")) {
                node.userProperties = opts.userProps;
            }
+            if (hasProperty(opts, "sessionExpiry")) {
+                node.sessionExpiryInterval = opts.sessionExpiry;
+            } else if (hasProperty(opts, "sessionExpiryInterval")) {
+                node.sessionExpiryInterval = opts.sessionExpiryInterval
+            }

            function createLWT(topic, payload, qos, retain, v5opts, v5SubPropName) {
                let message = undefined;
@@ -567,9 +579,6 @@ module.exports = function(RED) {
            if (typeof node.usetls === 'undefined') {
                node.usetls = false;
            }
-            if (typeof node.usews === 'undefined') {
-                node.usews = false;
-            }
            if (typeof node.verifyservercert === 'undefined') {
                node.verifyservercert = false;
            }
@@ -688,7 +697,8 @@ module.exports = function(RED) {
                node.options.rejectUnauthorized = (node.verifyservercert == "true" || node.verifyservercert === true);
            }
        }
-
+        node.v5 = () => node.options && node.options.protocolVersion == 5
+        node.subscriptionIdentifiersAvailable = () => node.v5() && node.serverProperties && node.serverProperties.subscriptionIdentifiersAvailable
        n.autoConnect = n.autoConnect === "false" || n.autoConnect === false ? false : true;
        node.setOptions(n, true);

@@ -698,16 +708,21 @@ module.exports = function(RED) {
            if (Object.keys(node.users).length === 1) {
                if(node.autoConnect) {
                    node.connect();
+                    //update nodes status
+                    setTimeout(function() {
+                        updateStatus(node, true)
+                    }, 1)
                }
            }
        };

-        node.deregister = function(mqttNode,done) {
+        node.deregister = function(mqttNode, done, autoDisconnect) {
            delete node.users[mqttNode.id];
-            if (!node.closing && node.connected && Object.keys(node.users).length === 0) {
-                node.disconnect();
+            if (autoDisconnect && !node.closing && node.connected && Object.keys(node.users).length === 0) {
+                node.disconnect(done);
+            } else {
+                done();
            }
-            done();
        };
        node.canConnect = function() {
            return !node.connected && !node.connecting;
@@ -782,7 +797,9 @@ module.exports = function(RED) {

                        // Send any birth message
                        if (node.birthMessage) {
-                            node.publish(node.birthMessage);
+                            setTimeout(() => {
+                                node.publish(node.birthMessage);
+                            }, 1);
                        }
                    });
                    node._clientOn("reconnect", function() {
@@ -839,7 +856,7 @@ module.exports = function(RED) {
            let waitEnd = (client, ms) => {
                return new Promise( (resolve, reject) => {
                    node.closing = true;
-                    if(!client) { 
+                    if(!client) {
                        resolve();
                     } else {
                        const t = setTimeout(() => {
@@ -904,7 +921,12 @@ module.exports = function(RED) {
            };
            node.subscriptions[topic][ref] = sub;
            if (node.connected) {
+                const subIdsAvailable = node.subscriptionIdentifiersAvailable()
                node._clientOn('message',sub.handler);
+                // if the broker doesn't support subscription identifiers (e.g. AWS core), then don't send them
+                if (options.properties && options.properties.subscriptionIdentifier && subIdsAvailable !== true) {
+                    delete options.properties.subscriptionIdentifier
+                }
                node.client.subscribe(topic, options);
            }
        };
@@ -991,14 +1013,21 @@ module.exports = function(RED) {
                }

                if (topicOK) {
-                    node.client.publish(msg.topic, msg.payload, options, function(err) {
-                        done && done(err);
-                        return
-                    });
+                    node.client.publish(msg.topic, msg.payload, options, function (err) {
+                        if (done) {
+                            done(err)
+                        } else if(err) {
+                            node.error(err, msg)
+                        }
+                    })
                } else {
-                    const error = new Error(RED._("mqtt.errors.invalid-topic"));
-                    error.warn = true;
-                    done(error);
+                    const error = new Error(RED._("mqtt.errors.invalid-topic"))
+                    error.warn = true
+                    if (done) {
+                        done(error)
+                    } else {
+                        node.warn(error, msg)
+                    }
                }
            }
        };
@@ -1011,7 +1040,7 @@ module.exports = function(RED) {

        /**
         * Add event handlers to the MQTT.js client and track them so that
-         * we do not remove any handlers that the MQTT client uses internally.  
+         * we do not remove any handlers that the MQTT client uses internally.
         * Use {@link node._clientRemoveListeners `node._clientRemoveListeners`} to remove handlers
         * @param {string} event The name of the event
         * @param {function} handler The handler for this event
@@ -1019,11 +1048,11 @@ module.exports = function(RED) {
         node._clientOn = function(event, handler) {
            node.clientListeners.push({event, handler})
            node.client.on(event, handler)
-        } 
+        }

        /**
-         * Remove event handlers from the MQTT.js client & only the events 
-         * that we attached in {@link node._clientOn `node._clientOn`}.  
+         * Remove event handlers from the MQTT.js client & only the events
+         * that we attached in {@link node._clientOn `node._clientOn`}.
         * * If `event` is omitted, then all events matching `handler` are removed
         * * If `handler` is omitted, then all events named `event` are removed
         * * If both parameters are omitted, then all events are removed
@@ -1212,7 +1241,7 @@ module.exports = function(RED) {
                    } else {
                        node.brokerConn.unsubscribe(node.topic,node.id, removed);
                    }
-                    node.brokerConn.deregister(node, done);
+                    node.brokerConn.deregister(node, done, removed);
                    node.brokerConn = null;
                } else {
                    done();
@@ -1275,9 +1304,9 @@ module.exports = function(RED) {
                node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
            }
            node.brokerConn.register(node);
-            node.on('close', function(done) {
+            node.on('close', function(removed, done) {
                if (node.brokerConn) {
-                    node.brokerConn.deregister(node,done);
+                    node.brokerConn.deregister(node, done, removed)
                    node.brokerConn = null;
                } else {
                    done();
--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.html
@@ -227,6 +227,7 @@
                        }
                    });
                },
+                sortable: true,
                removable: true
            });

--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
@@ -46,7 +46,7 @@ module.exports = function(RED) {
                    isText = true;
                } else if (parsedType.type !== "application") {
                    isText = false;
-                } else if ((parsedType.subtype !== "octet-stream") 
+                } else if ((parsedType.subtype !== "octet-stream")
                    && (parsedType.subtype !== "cbor")
                    && (parsedType.subtype !== "x-protobuf")) {
                    checkUTF = true;
@@ -200,6 +200,15 @@ module.exports = function(RED) {
            this.callback = function(req,res) {
                var msgid = RED.util.generateId();
                res._msgid = msgid;
+                // Since Node 15, req.headers are lazily computed and the property
+                // marked as non-enumerable.
+                // That means it doesn't show up in the Debug sidebar.
+                // This redefines the property causing it to be evaluated *and*
+                // marked as enumerable again.
+                Object.defineProperty(req, 'headers', {
+                    value: req.headers,
+                    enumerable: true
+                })
                if (node.method.match(/^(post|delete|put|options|patch)$/)) {
                    node.send({_msgid:msgid,req:req,res:createResponseWrapper(node,res),payload:req.body});
                } else if (node.method == "get") {
@@ -282,7 +291,7 @@ module.exports = function(RED) {
        RED.nodes.createNode(this,n);
        var node = this;
        this.headers = n.headers||{};
-        this.statusCode = n.statusCode;
+        this.statusCode = parseInt(n.statusCode);
        this.on("input",function(msg,_send,done) {
            if (msg.res) {
                var headers = RED.util.cloneMessage(node.headers);
@@ -323,7 +332,7 @@ module.exports = function(RED) {
                        }
                    }
                }
-                var statusCode = node.statusCode || msg.statusCode || 200;
+                var statusCode = node.statusCode || parseInt(msg.statusCode) || 200;
                if (typeof msg.payload == "object" && !Buffer.isBuffer(msg.payload)) {
                    msg.res._res.status(statusCode).jsonp(msg.payload);
                } else {
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -91,6 +91,11 @@
        <label for="node-input-senderr" style="width: auto" data-i18n="httpin.senderr"></label>
    </div>

+    <div class="form-row">
+        <input type="checkbox" id="node-input-insecureHTTPParser" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-insecureHTTPParser", style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
+    </div>
+

    <div class="form-row">
        <label for="node-input-ret"><i class="fa fa-arrow-left"></i> <span data-i18n="httpin.label.return"></span></label>
@@ -227,6 +232,7 @@
            persist: {value:false},
            proxy: {type:"http proxy",required: false,
                    label:RED._("node-red:httpin.proxy-config") },
+            insecureHTTPParser: {value: false},
            authType: {value: ""},
            senderr: {value: false},
            headers: { value: [] }
@@ -338,6 +344,12 @@
            } else {
                $("#node-input-useProxy").prop("checked", false);
            }
+
+            if (node.insecureHTTPParser) {
+                $("node-intput-insecureHTTPParser").prop("checked", true)
+            } else {
+                $("node-intput-insecureHTTPParser").prop("checked", false)
+            }
            updateProxyOptions();
            $("#node-input-useProxy").on("click", function() {
                updateProxyOptions();
@@ -405,6 +417,7 @@
                    });

                },
+                sortable: true,
                removable: true
            });
            if (node.headers) {
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -86,6 +86,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
        if (n.paytoqs === true || n.paytoqs === "query") { paytoqs = true; }
        else if (n.paytoqs === "body") { paytobody = true; }

+        node.insecureHTTPParser = n.insecureHTTPParser

        var prox, noprox;
        if (process.env.http_proxy) { prox = process.env.http_proxy; }
@@ -244,6 +245,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                delete options.headers[h];
                            }
                        })
+
+                        if (node.insecureHTTPParser) {
+                            options.insecureHTTPParser = true
+                        }
                    }
                ],
                beforeRedirect: [
@@ -430,6 +435,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                    formData.append(opt, val);
                                } else if (typeof val === 'object' && val.hasOwnProperty('value')) {
                                    formData.append(opt,val.value,val.options || {});
+                                } else if (Array.isArray(val)) {
+                                    for (var i=0; i<val.length; i++) {
+                                        formData.append(opt, val[i])
+                                    }
                                } else {
                                    formData.append(opt,JSON.stringify(val));
                                }
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -110,7 +110,12 @@ module.exports = function(RED) {
                                        if (msg.payload[s].hasOwnProperty(p)) {
                                            /* istanbul ignore else */
                                            if (typeof msg.payload[s][p] !== "object") {
-                                                var q = "" + msg.payload[s][p];
+                                            // Fix to honour include null values flag
+                                            //if (typeof msg.payload[s][p] !== "object" || (node.include_null_values === true && msg.payload[s][p] === null)) {
+                                                var q = "";
+                                                if (msg.payload[s][p] !== undefined) {
+                                                    q += msg.payload[s][p];
+                                                }
                                                if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                    q = q.replace(/"/g, '""');
                                                    ou += node.quo + q + node.quo + node.sep;
@@ -130,9 +135,15 @@ module.exports = function(RED) {
                                            ou += node.sep;
                                        }
                                        else {
-                                            var p = RED.util.ensureString(RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']"));
+                                            var tt = template[t];
+                                            if (template[t].indexOf('"') >=0 ) { tt = "'"+tt+"'"; }
+                                            else { tt = '"'+tt+'"'; }
+                                            var p = RED.util.getMessageProperty(msg,'payload["'+s+'"]['+tt+']');
                                            /* istanbul ignore else */
-                                            if (p === "undefined") { p = ""; }
+                                            if (p === undefined) { p = ""; }
+                                            // fix to honour include null values flag
+                                            //if (p === null && node.include_null_values !== true) { p = "";}
+                                            p = RED.util.ensureString(p);
                                            if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                p = p.replace(/"/g, '""');
                                                ou += node.quo + p + node.quo + node.sep;
--- a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
+++ b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
@@ -251,7 +251,9 @@ module.exports = function(RED) {
                        }
                        else {
                            node.buffer = buff.slice(p,buff.length);
-                            node.pendingDones.push(done);
+                            if (node.buffer.length > 0) {
+                                node.pendingDones.push(done);
+                            }
                        }
                        if (node.buffer.length == 0) {
                            done();
--- a/packages/node_modules/@node-red/nodes/core/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/core/storage/10-file.html
--- a/packages/node_modules/@node-red/nodes/core/storage/10-file.js
+++ b/packages/node_modules/@node-red/nodes/core/storage/10-file.js
@@ -117,7 +117,9 @@ module.exports = function(RED) {
                }
                if (typeof data === "boolean") { data = data.toString(); }
                if (typeof data === "number") { data = data.toString(); }
-                if ((node.appendNewline) && (!Buffer.isBuffer(data))) { data += os.EOL; }
+                var aflg = true;
+                if (msg.hasOwnProperty("parts") && msg.parts.type === "string" && (msg.parts.count === msg.parts.index + 1)) { aflg = false; }
+                if ((node.appendNewline) && (!Buffer.isBuffer(data)) && aflg) { data += os.EOL; }
                var buf;
                if (node.encoding === "setbymsg") {
                    buf = encode(data, msg.encoding || "none");
@@ -314,7 +316,6 @@ module.exports = function(RED) {
            });
            filename = filename || "";
            var fullFilename = filename;
-            var filePath = "";
            if (filename && RED.settings.fileWorkingDirectory && !path.isAbsolute(filename)) {
                fullFilename = path.resolve(path.join(RED.settings.fileWorkingDirectory,filename));
            }
--- a/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/20-inject.html
--- a/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/21-debug.html
--- a/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/25-catch.html
--- a/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/25-status.html
--- a/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/60-link.html
--- a/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/90-comment.html
--- a/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/common/98-unknown.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/10-switch.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/15-change.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/16-range.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/80-template.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/89-delay.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/89-trigger.html
--- a/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/90-exec.html
--- a/packages/node_modules/@node-red/nodes/locales/de/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json
--- a/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/05-tls.html
--- a/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/network/06-httpproxy.html
--- a/Show More
+++ b/Show More