Merge pull request #3832 from node-red/update-gen-pub-script

Update gen pub script
Update generate-publish-script with latest release number
2025-03-01 10:36:34 +00:00 · 2022-08-04 14:09:28 +01:00 · 2022-08-04 14:08:04 +01:00 · 2022-08-04 14:01:45 +01:00 · 2022-08-04 14:00:37 +01:00 · 2022-08-04 13:49:43 +01:00
201 changed files with 5861 additions and 4534 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,12 +38,9 @@ If you want to raise a pull-request with a new feature, or a refactoring
 of existing code, it may well get rejected if you haven't discussed it on
 the [forum](https://discourse.nodered.org) first.

-All contributors need to sign the JS Foundation's Contributor License Agreement.
-It is an online process and quick to do. You can read the details of the agreement
-here: https://cla.js.foundation/node-red/node-red.
-
-If you raise a pull-request without having signed the CLA, you will be prompted
-to do so automatically.
+All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
+It is an online process and quick to do. If you raise a pull-request without
+having signed the CLA, you will be prompted to do so automatically.


 ### Code Branches
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -583,7 +583,7 @@ module.exports = function(grunt) {
    grunt.registerMultiTask('attachCopyright', function() {
        var files = this.data.src;
        var copyright = "/**\n"+
-            " * Copyright JS Foundation and other contributors, http://js.foundation\n"+
+            " * Copyright OpenJS Foundation and other contributors, https://openjsf.org/\n"+
            " *\n"+
            " * Licensed under the Apache License, Version 2.0 (the \"License\");\n"+
            " * you may not use this file except in compliance with the License.\n"+
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena

 ## Authors

-Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
+Node-RED is a project of the [OpenJS Foundation](http://openjsf.org).

-It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).
-
-* Nick O'Leary [@knolleary](http://twitter.com/knolleary)
-* Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
+It is maintained by:

+ * Nick O'Leary [@knolleary](http://twitter.com/knolleary)
+ * Dave Conway-Jones [@ceejay](http://twitter.com/ceejay)
+ * And many others...


 ## Copyright and license
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "2.1.0",
+    "version": "2.2.3",
    "description": "Low-code programming for event-driven applications",
    "homepage": "http://nodered.org",
    "license": "Apache-2.0",
@@ -26,66 +26,66 @@
        }
    ],
    "dependencies": {
-        "acorn": "8.5.0",
+        "acorn": "8.7.0",
        "acorn-walk": "8.2.0",
-        "ajv": "8.6.3",
+        "ajv": "8.10.0",
        "async-mutex": "0.3.2",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
+        "body-parser": "1.19.1",
        "cheerio": "1.0.0-rc.10",
        "clone": "2.1.2",
        "content-type": "1.0.4",
-        "cookie": "0.4.1",
-        "cookie-parser": "1.4.5",
+        "cookie": "0.4.2",
+        "cookie-parser": "1.4.6",
        "cors": "2.8.5",
        "cronosjs": "1.7.1",
        "denque": "2.0.1",
-        "express": "4.17.1",
+        "express": "4.17.2",
        "express-session": "1.17.2",
        "form-data": "4.0.0",
        "fs-extra": "10.0.0",
        "fs.notify": "0.0.4",
-        "got": "11.8.2",
+        "got": "11.8.3",
        "hash-sum": "2.0.0",
        "hpagent": "0.1.2",
        "https-proxy-agent": "5.0.0",
-        "i18next": "21.3.1",
+        "i18next": "21.6.11",
        "iconv-lite": "0.6.3",
        "is-utf8": "0.2.1",
        "js-yaml": "3.14.1",
        "json-stringify-safe": "5.0.1",
-        "jsonata": "1.8.5",
+        "jsonata": "1.8.6",
        "lodash.clonedeep": "^4.5.0",
        "media-typer": "1.1.0",
-        "memorystore": "1.6.6",
-        "mime": "2.5.2",
-        "moment-timezone": "0.5.33",
-        "mqtt": "4.2.8",
-        "multer": "1.4.3",
+        "memorystore": "1.6.7",
+        "mime": "3.0.0",
+        "moment-timezone": "0.5.34",
+        "mqtt": "4.3.5",
+        "multer": "1.4.4",
        "mustache": "4.2.0",
-        "node-red-admin": "^2.2.1",
+        "node-red-admin": "^2.2.3",
        "nopt": "5.0.0",
-        "oauth2orize": "1.11.0",
+        "oauth2orize": "1.11.1",
        "on-headers": "1.0.2",
-        "passport": "0.5.0",
+        "passport": "0.5.2",
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.1",
+        "raw-body": "2.4.3",
        "semver": "7.3.5",
        "tar": "6.1.11",
        "tough-cookie": "4.0.0",
-        "uglify-js": "3.14.2",
+        "uglify-js": "3.15.1",
        "uuid": "8.3.2",
-        "ws": "7.5.1",
+        "ws": "7.5.6",
        "xml2js": "0.4.23"
    },
    "optionalDependencies": {
        "bcrypt": "5.0.1"
    },
    "devDependencies": {
-        "dompurify": "2.3.3",
-        "grunt": "1.4.1",
+        "dompurify": "2.3.6",
+        "grunt": "1.5.2",
        "grunt-chmod": "~1.1.1",
        "grunt-cli": "~1.4.3",
        "grunt-concurrent": "3.0.0",
@@ -104,20 +104,20 @@
        "grunt-sass": "~3.1.0",
        "grunt-simple-mocha": "~0.4.1",
        "grunt-simple-nyc": "^3.0.1",
-        "i18next-http-backend": "1.3.1",
+        "i18next-http-backend": "1.3.2",
        "jquery-i18next": "1.2.1",
        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "3.0.7",
+        "marked": "4.0.12",
        "minami": "1.2.3",
-        "mocha": "9.1.2",
+        "mocha": "9.2.0",
        "node-red-node-test-helper": "^0.2.7",
-        "nodemon": "2.0.13",
+        "nodemon": "2.0.15",
        "proxy": "^1.0.2",
-        "sass": "1.43.2",
+        "sass": "1.49.7",
        "should": "13.2.3",
        "sinon": "11.1.2",
        "stoppable": "^1.1.0",
-        "supertest": "6.1.6"
+        "supertest": "6.2.2"
    },
    "engines": {
        "node": ">=12"
--- a/packages/node_modules/@node-red/editor-api/LICENSE
+++ b/packages/node_modules/@node-red/editor-api/LICENSE
@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/

                                 Apache License
                           Version 2.0, January 2004
--- a/packages/node_modules/@node-red/editor-api/lib/auth/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/index.js
@@ -141,7 +141,7 @@ function completeVerify(profile,done) {
    Users.authenticate(profile).then(function(user) {
        if (user) {
            Tokens.create(user.username,"node-red-editor",user.permissions).then(function(tokens) {
-                log.audit({event: "auth.login",username:user.username,scope:user.permissions});
+                log.audit({event: "auth.login",user,username:user.username,scope:user.permissions});
                user.tokens = tokens;
                done(null,user);
            });
--- a/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
+++ b/packages/node_modules/@node-red/editor-api/lib/auth/strategies.js
@@ -93,7 +93,7 @@ var passwordTokenExchange = function(client, username, password, scope, done) {
                    return logEntry.user !== username;
                });
                Tokens.create(username,client.id,scope).then(function(tokens) {
-                    log.audit({event: "auth.login",username:username,client:client.id,scope:scope});
+                    log.audit({event: "auth.login",user,username:username,client:client.id,scope:scope});
                    done(null,tokens.accessToken,null,{expires_in:tokens.expires_in});
                });
            } else {
@@ -146,7 +146,7 @@ function authenticateUserToken(req) {
                } else {
                    reject();
                }
-            });
+            }).catch(reject);
        } else {
            reject();
        }
@@ -163,6 +163,9 @@ TokensStrategy.prototype.authenticate = function(req) {
    authenticateUserToken(req).then(user => {
        this.success(user,{scope:user.permissions});
    }).catch(err => {
+        if (err) {
+            log.trace("token authentication failure: "+err.stack?err.stack:err)
+        }
        this.fail(401);
    });
 }
--- a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
@@ -48,9 +48,10 @@ module.exports = {
        var prevLang = i18n.i.language;
        // Trigger a load from disk of the language if it is not the default
        i18n.i.changeLanguage(lang, function(){
-            var catalog = loadResource(lang, namespace);
-            res.json(catalog||{});
+            i18n.i.changeLanguage(prevLang, function() {
+                var catalog = loadResource(lang, namespace);
+                res.json(catalog||{});
+            });
        });
-        i18n.i.changeLanguage(prevLang);
    }
 }
--- a/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/projects.js
@@ -122,6 +122,7 @@ module.exports = {
            }

            if (req.body.active) {
+                opts.clearContext = req.body.hasOwnProperty('clearContext')?req.body.clearContext:true
                runtimeAPI.projects.setActiveProject(opts).then(function() {
                    listProjects(req,res);
                }).catch(function(err) {
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -27,7 +27,8 @@ var defaultContext = {
        tabicon: {
            icon: "red/images/node-red-icon-black.svg",
            colour: "#8f0000"
-        }
+        },
+        version: require(path.join(__dirname,"../../package.json")).version
    },
    header: {
        title: "Node-RED",
@@ -227,6 +228,11 @@ module.exports = {
        if (theme.theme) {
            themeSettings.theme = theme.theme;
        }
+
+        if (theme.hasOwnProperty("tours")) {
+            themeSettings.tours = theme.tours;
+        }
+
        return themeApp;
    },
    context: async function() {
--- a/packages/node_modules/@node-red/editor-api/lib/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/index.js
@@ -90,6 +90,8 @@ function init(settings,_server,storage,runtimeAPI) {
                    auth.getToken,
                    auth.errorHandler
                );
+            } else if (settings.adminAuth.tokens) {
+                adminApp.use(passport.initialize());
            }
            adminApp.post("/auth/revoke",auth.needsPermission(""),auth.revoke,apiUtil.errorHandler);
        }
--- 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": "2.1.0",
+    "version": "2.2.3",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,23 +16,23 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "2.1.0",
-        "@node-red/editor-client": "2.1.0",
+        "@node-red/util": "2.2.3",
+        "@node-red/editor-client": "2.2.3",
        "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
+        "body-parser": "1.19.1",
        "clone": "2.1.2",
        "cors": "2.8.5",
        "express-session": "1.17.2",
-        "express": "4.17.1",
-        "memorystore": "1.6.6",
-        "mime": "2.5.2",
-        "multer": "1.4.3",
+        "express": "4.17.2",
+        "memorystore": "1.6.7",
+        "mime": "3.0.0",
+        "multer": "1.4.4",
        "mustache": "4.2.0",
-        "oauth2orize": "1.11.0",
+        "oauth2orize": "1.11.1",
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.5.0",
-        "ws": "7.5.1"
+        "passport": "0.5.2",
+        "ws": "7.5.6"
    },
    "optionalDependencies": {
        "bcrypt": "5.0.1"
--- a/packages/node_modules/@node-red/editor-client/LICENSE
+++ b/packages/node_modules/@node-red/editor-client/LICENSE
@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/

                                 Apache License
                           Version 2.0, January 2004
--- 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
@@ -59,6 +59,8 @@
        "hideOtherFlows": "Hide other flows",
        "showAllFlows": "Show all flows",
        "hideAllFlows": "Hide all flows",
+        "hiddenFlows": "List __count__ hidden flow",
+        "hiddenFlows_plural": "List __count__ hidden flows",
        "showLastHiddenFlow": "Show last hidden flow",
        "listFlows": "List flows",
        "listSubflows": "List subflows",
@@ -73,6 +75,8 @@
            "view": {
                "view": "View",
                "grid": "Grid",
+                "storeZoom": "Restore zoom level on load",
+                "storePosition": "Restore scroll position on load",
                "showGrid": "Show grid",
                "snapGrid": "Snap to grid",
                "gridSize": "Grid size",
@@ -90,6 +94,7 @@
            "palette": {
                "show": "Show palette"
            },
+            "edit": "Edit",
            "settings": "Settings",
            "userSettings": "User Settings",
            "nodes": "Nodes",
@@ -668,7 +673,8 @@
                "unusedConfigNodes": "Unused configuration nodes",
                "invalidNodes": "Invalid nodes",
                "uknownNodes": "Unknown nodes",
-                "unusedSubflows": "Unused subflows"
+                "unusedSubflows": "Unused subflows",
+                "hiddenFlows": "Hidden flows"
            }
        },
        "help": {
@@ -890,6 +896,8 @@
        "addTitle": "add an item"
    },
    "search": {
+        "history": "Search history",
+        "clear": "clear all",
        "empty": "No matches found",
        "addNode": "add a node..."
    },
@@ -1087,7 +1095,8 @@
            "not-git": "Not a git repository",
            "no-resource": "Repository not found",
            "cant-get-ssh-key-path": "Error! Can't get selected SSH key path.",
-            "unexpected_error": "unexpected_error"
+            "unexpected_error": "unexpected_error",
+            "clearContext": "Clear context when switching projects"
        },
        "delete": {
            "confirm": "Are you sure you want to delete this project?"
@@ -1135,6 +1144,7 @@
        "defaultValue": "Default value"
    },
    "tourGuide": {
+        "takeATour": "Take a tour",
        "start": "Start",
        "next": "Next"
    },
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -54,7 +54,16 @@
        "delete": "本当に '__label__' を削除しますか？",
        "dropFlowHere": "ここにフローをドロップしてください",
        "addFlow": "フローの追加",
+        "addFlowToRight": "右側にフローを追加",
+        "hideFlow": "フローを非表示",
+        "hideOtherFlows": "他のフローを非表示",
+        "showAllFlows": "全てのフローを表示",
+        "hideAllFlows": "全てのフローを非表示",
+        "hiddenFlows": "__count__ 個の非表示のフロー一覧",
+        "hiddenFlows_plural": "__count__ 個の非表示のフロー一覧",
+        "showLastHiddenFlow": "最後に非表示にしたフローを表示",
        "listFlows": "フロー一覧",
+        "listSubflows": "サブフロー一覧",
        "status": "状態",
        "enabled": "有効",
        "disabled": "無効",
@@ -66,6 +75,8 @@
            "view": {
                "view": "表示",
                "grid": "グリッド",
+                "storeZoom": "読み込み時に拡大/縮小のレベルを復元",
+                "storePosition": "読み込み時にスクロール位置を復元",
                "showGrid": "グリッドを表示",
                "snapGrid": "ノードの配置を補助",
                "gridSize": "グリッドの大きさ",
@@ -83,6 +94,7 @@
            "palette": {
                "show": "パレットを表示"
            },
+            "edit": "編集",
            "settings": "設定",
            "userSettings": "ユーザ設定",
            "nodes": "ノード",
@@ -105,6 +117,7 @@
            "editPalette": "パレットの管理",
            "other": "その他",
            "showTips": "ヒントを表示",
+            "showWelcomeTours": "新バージョンのガイドツアーを表示",
            "help": "Node-REDウェブサイト",
            "projects": "プロジェクト",
            "projects-new": "新規",
@@ -116,7 +129,20 @@
            "groupSelection": "選択部分をグループ化",
            "ungroupSelection": "選択部分をグループ解除",
            "groupMergeSelection": "選択部分をマージ",
-            "groupRemoveSelection": "グループから削除"
+            "groupRemoveSelection": "グループから削除",
+            "arrange": "配置",
+            "alignLeft": "左揃え",
+            "alignCenter": "左右中央揃え",
+            "alignRight": "右揃え",
+            "alignTop": "上揃え",
+            "alignMiddle": "上下中央揃え",
+            "alignBottom": "下揃え",
+            "distributeHorizontally": "左右に整列",
+            "distributeVertically": "上下に整列",
+            "moveToBack": "最背面へ移動",
+            "moveToFront": "最前面へ移動",
+            "moveBackwards": "背面へ移動",
+            "moveForwards": "前面へ移動"
        }
    },
    "actions": {
@@ -451,7 +477,8 @@
        "global": "グローバル",
        "workspace": "ワークスペース",
        "selectAll": "全てのノードを選択",
-        "selectAllConnected": "接続された全てのノードを選択",
+        "selectNone": "選択を外す",
+        "selectAllConnected": "接続されたノードを選択",
        "addRemoveNode": "ノードの選択、選択解除",
        "editSelected": "選択したノードを編集",
        "deleteSelected": "選択したノードや接続を削除",
@@ -461,10 +488,13 @@
        "moveNode": "選択したノードを移動(移動量大)",
        "toggleSidebar": "サイドバーの表示/非表示",
        "togglePalette": "パレットの表示/非表示",
-        "copyNode": "選択したノードをコピー",
-        "cutNode": "選択したノードを切り取り",
+        "copyNode": "ノードをコピー",
+        "cutNode": "ノードを切り取り",
        "pasteNode": "ノードを貼り付け",
+        "copyGroupStyle": "グループ様式をコピー",
+        "pasteGroupStyle": "グループ様式を貼り付け",
        "undoChange": "変更操作を戻す",
+        "redoChange": "変更操作をやり直し",
        "searchBox": "ノードを検索",
        "managePalette": "パレットの管理",
        "actionList": "動作一覧"
@@ -519,7 +549,8 @@
            "nodeEnabled_plural": "ノードを有効化しました:",
            "nodeDisabled": "ノードを無効化しました:",
            "nodeDisabled_plural": "ノードを無効化しました:",
-            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました"
+            "nodeUpgraded": "ノードモジュール __module__ をバージョン __version__ へ更新しました",
+            "unknownNodeRegistered": "ノードの読み込みエラー: <ul><li>__type__<br>__error__</li></ul>"
        },
        "editor": {
            "title": "パレットの管理",
@@ -642,7 +673,8 @@
                "unusedConfigNodes": "未使用の設定ノード",
                "invalidNodes": "不正なノード",
                "uknownNodes": "未知のノード",
-                "unusedSubflows": "未使用のサブフロー"
+                "unusedSubflows": "未使用のサブフロー",
+                "hiddenFlows": "非表示のフロー"
            }
        },
        "help": {
@@ -813,7 +845,7 @@
                "pushFailed": "リモートに新しいコミットがあるため、プッシュに失敗しました。プルしてマージしてから、再度プッシュしてください。",
                "push": "プッシュ",
                "pull": "プル",
-                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更を上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
+                "unablePull": "<p>リモートの変更のプル失敗：ステージングされていないローカルの変更が上書きされてしまいます。</p><p>変更をコミットしてから再度実行してください。</p>",
                "showUnstagedChanges": "ステージングされていない変更を表示",
                "connectionFailed": "リモートリポジトリに接続できません: ",
                "pullUnrelatedHistory": "<p>リモートに関連のないコミット履歴があります。</p><p>本当に変更をプルしてローカルリポジトリに反映しますか？</p>",
@@ -864,6 +896,8 @@
        "addTitle": "要素を追加"
    },
    "search": {
+        "history": "検索履歴",
+        "clear": "全て削除",
        "empty": "一致したものが見つかりませんでした",
        "addNode": "ノードを追加..."
    },
@@ -1061,7 +1095,8 @@
            "not-git": "Gitリポジトリではありません",
            "no-resource": "リポジトリが見つかりません",
            "cant-get-ssh-key-path": "エラー! 選択したSSHキーのパスを取得できません。",
-            "unexpected_error": "予期しないエラー"
+            "unexpected_error": "予期しないエラー",
+            "clearContext": "プロジェクトを切り替る際にコンテキストを初期化"
        },
        "delete": {
            "confirm": "プロジェクトを削除しても良いですか?"
@@ -1108,6 +1143,11 @@
        "preview": "UIプレビュー",
        "defaultValue": "デフォルト値"
    },
+    "tourGuide": {
+        "takeATour": "ツアーを開始",
+        "start": "開始",
+        "next": "次へ"
+    },
    "languages": {
        "de": "ドイツ語",
        "en-US": "英語",
@@ -1116,5 +1156,141 @@
        "ru": "ロシア語",
        "zh-CN": "中国語(簡体)",
        "zh-TW": "中国語(繁体)"
+    },
+    "action-list": {
+        "toggle-show-tips": "ヒント表示切替",
+        "show-about": "Node-REDの説明を表示",
+        "show-welcome-tour": "ウェルカムツアー表示",
+        "show-next-tab": "次のタブを表示",
+        "show-previous-tab": "前のタブを表示",
+        "add-flow": "フローを追加",
+        "add-flow-to-right": "フローを右に追加",
+        "edit-flow": "フローを編集",
+        "remove-flow": "フローを削除",
+        "enable-flow": "フローを有効化",
+        "disable-flow": "フローを無効化",
+        "hide-flow": "フローを隠す",
+        "hide-other-flows": "他のフローを非表示",
+        "hide-all-flows": "全てのフローを非表示",
+        "show-all-flows": "全てのフローを表示",
+        "show-last-hidden-flow": "最後に非表示にしたフローを表示",
+        "list-hidden-flows": "非表示フローを表示",
+        "list-flows": "フロー一覧",
+        "list-subflows": "サブフロー一覧",
+        "go-to-previous-location": "前の位置に移動",
+        "go-to-next-location": "次の位置に移動",
+        "copy-selection-to-internal-clipboard": "選択をクリップボードにコピー",
+        "cut-selection-to-internal-clipboard": "選択をクリップボードに切り取り",
+        "paste-from-internal-clipboard": "クリップボードから貼り付け",
+        "detach-selected-nodes": "選択ノードを接続から外す",
+        "delete-selection": "選択を削除",
+        "delete-selection-and-reconnect": "選択を削除し再接続",
+        "edit-selected-node": "選択したノードを編集",
+        "go-to-selection": "選択に移動",
+        "undo": "変更操作を戻す",
+        "redo": "変更操作をやり直し",
+        "select-all-nodes": "全てのノードを選択",
+        "select-none": "ノードを選択",
+        "enable-selected-nodes": "選択ノードを有効化",
+        "disable-selected-nodes": "選択ノードを無効化",
+        "toggle-show-grid": "グリッド表示切替",
+        "toggle-snap-grid": "ノードの配置補助切替",
+        "toggle-status": "ステータス表示切替",
+        "show-selected-node-labels": "選択したノードのラベルを表示",
+        "hide-selected-node-labels": "選択したノードのラベルを非表示",
+        "scroll-view-up": "上スクロール",
+        "scroll-view-right": "右スクロール",
+        "scroll-view-down": "下スクロール",
+        "scroll-view-left": "左スクロール",
+        "step-view-up": "一単位上スクロール",
+        "step-view-right": "一単位右スクロール",
+        "step-view-down": "一単位下スクロール",
+        "step-view-left": "一単位左スクロール",
+        "move-selection-up": "選択を上移動",
+        "move-selection-right": "選択を右移動",
+        "move-selection-down": "選択を下移動",
+        "move-selection-left": "選択を左移動",
+        "move-selection-forwards": "選択を前面に移動",
+        "move-selection-backwards": "選択を背面に移動",
+        "move-selection-to-front": "選択を最前面に移動",
+        "move-selection-to-back": "選択を最背面に移動",
+        "step-selection-up": "選択を一単位上移動",
+        "step-selection-right": "選択を一単位右移動",
+        "step-selection-down": "選択を一単位下移動",
+        "step-selection-left": "選択を一単位左移動",
+        "select-connected-nodes": "接続されたノードを選択",
+        "select-downstream-nodes": "後方に接続されたノードを選択",
+        "select-upstream-nodes": "前方に接続されたノードを選択",
+        "go-to-next-node": "次のノードに移動",
+        "go-to-previous-node": "前のノードに移動",
+        "go-to-next-sibling": "次の兄弟ノードに移動",
+        "go-to-previous-sibling": "前の兄弟ノードに移動",
+        "go-to-nearest-node-on-left": "最も近い左側ノードに移動",
+        "go-to-nearest-node-on-right": "最も近い右側ノードに移動",
+        "go-to-nearest-node-above": "最も近い上側ノードに移動",
+        "go-to-nearest-node-below": "最も近い下側ノードに移動",
+        "align-selection-to-grid": "選択を整列",
+        "align-selection-to-left": "選択を左揃え",
+        "align-selection-to-right": "選択を右揃え",
+        "align-selection-to-top": "選択を上揃え",
+        "align-selection-to-bottom": "選択を下揃え",
+        "align-selection-to-middle": "選択を上下中央揃え",
+        "align-selection-to-center": "選択を左右中央揃え",
+        "distribute-selection-horizontally": "選択を左右に整列",
+        "distribute-selection-vertically": "選択を上下に整列",
+        "wire-series-of-nodes": "ノードを一続きに接続",
+        "wire-node-to-multiple": "ノードを複数に接続",
+        "show-user-settings": "ユーザ設定を表示",
+        "show-help": "ヘルプを表示",
+        "toggle-palette": "パレットの表示切替",
+        "show-event-log": "イベントログを表示",
+        "manage-palette": "パレットの管理",
+        "toggle-sidebar": "サイドバーの表示切替",
+        "show-info-tab": "ノード情報タブの表示",
+        "show-help-tab": "ノードヘルプタブの表示",
+        "show-config-tab": "設定ノードタブの表示",
+        "select-all-config-nodes": "全ての設定ノードを選択",
+        "delete-config-selection": "選択した設定ノードを削除",
+        "show-context-tab": "コンテキストデータタブを表示",
+        "create-subflow": "サブフローを作成",
+        "convert-to-subflow": "選択をサブフローに変換",
+        "group-selection": "選択をグループ化",
+        "ungroup-selection": "選択をグループ解除",
+        "merge-selection-to-group": "選択をグループにマージ",
+        "remove-selection-from-group": "選択をグループから削除",
+        "copy-group-style": "グループのスタイルをコピー",
+        "paste-group-style": "グループのスタイルを貼り付け",
+        "show-export-dialog": "書き出しダイアログを表示",
+        "show-import-dialog": "読み込みダイアログを表示",
+        "show-library-export-dialog": "ライブラリ書き出しダイアログを表示",
+        "show-library-import-dialog": "ライブラリ読み込みダイアログを表示",
+        "show-examples-import-dialog": "サンプル読み込みダイアログを表示",
+        "search": "検索",
+        "show-action-list": "アクション一覧を表示",
+        "confirm-edit-tray": "編集を完了",
+        "cancel-edit-tray": "編集をキャンセル",
+        "show-remote-diff": "リモートとの変更差分を表示",
+        "deploy-flows": "フローをデプロイ",
+        "restart-flows": "フローを再起動",
+        "set-deploy-type-to-full": "デプロイを「全て」に設定",
+        "set-deploy-type-to-modified-flows": "デプロイを「変更したフロー」に設定",
+        "set-deploy-type-to-modified-nodes": "デプロイを「変更したノード」に設定",
+        "show-debug-tab": "デバッグタブを表示",
+        "clear-debug-messages": "デバッグメッセージをクリア",
+        "clear-filtered-debug-messages": "フィルタしたデバッグメッセージをクリア",
+        "activate-selected-debug-nodes": "選択したデバッグノードを有効化",
+        "activate-all-debug-nodes": "全てのデバッグノードを有効化",
+        "activate-all-flow-debug-nodes": "フロー内の全デバッグノードを有効化",
+        "deactivate-selected-debug-nodes": "選択したデバッグノードを無効化",
+        "deactivate-all-debug-nodes": "全てのデバッグノードを無効化",
+        "deactivate-all-flow-debug-nodes": "フロー内の全デバッグノードを無効化",
+        "zoom-in": "ズームイン",
+        "zoom-out": "ズームアウト",
+        "zoom-reset": "ズームリセット",
+        "toggle-navigator": "ナビゲータ表示切替",
+        "new-project": "新しいプロジェクト",
+        "open-project": "プロジェクトを開く",
+        "show-project-settings": "プロジェクト設定を表示",
+        "show-version-control-tab": "バージョンコントロールタブを表示"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/ja/infotips.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/infotips.json
@@ -17,7 +17,7 @@
        "tip14": "[shift] を押しながらノードを [click] すると、接続された全てのノードを選択できます。",
        "tip15": "[ctrl] を押しながらノードを [click] すると、選択/非選択を切り替えできます。",
        "tip16": "{{core:show-previous-tab}} や {{core:show-next-tab}} で、タブの切り替えができます。",
-        "tip17": "ノードのプロバティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
+        "tip17": "ノードのプロパティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
        "tip18": "ノードを選択し、 {{core:edit-selected-node}} を押すとプロパティ設定画面が表示されます。"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
@@ -225,7 +225,7 @@
            "compact": "紧凑",
            "formatted": "已格式化",
            "copy": "导出到剪贴板",
-            "export": "到处到库",
+            "export": "导出到库",
            "exportAs": "导出为",
            "overwrite": "替换",
            "exists": "<p><b>\"__file__\"</b>已存在</p><p>是否要替换它？</p>"
--- 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": "2.1.0",
+    "version": "2.2.3",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/ace/mode/nrjavascript_worker.js
+++ b/packages/node_modules/@node-red/editor-client/src/ace/mode/nrjavascript_worker.js
@@ -98,7 +98,7 @@ oop.inherits(NRJavaScriptWorker, Mirror);
        if (options) {
            for (var opt in options) {
                if (options.hasOwnProperty(opt)) {
-                    this.options[opt] = options.opt;
+                    this.options[opt] = options[opt];
                }
            }
        }
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -684,6 +684,13 @@ RED.history = (function() {
        peek: function() {
            return undoHistory[undoHistory.length-1];
        },
+        replace: function(ev) {
+            if (undoHistory.length === 0) {
+                RED.history.push(ev);
+            } else {
+                undoHistory[undoHistory.length-1] = ev;
+            }
+        },
        clear: function() {
            undoHistory = [];
            redoHistory = [];
--- a/packages/node_modules/@node-red/editor-client/src/js/i18n.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
@@ -38,6 +38,8 @@ RED.i18n = (function() {
                defaultNS: "editor",
                fallbackLng: ['en-US'],
                returnObjects: true,
+                keySeparator: ".",
+                nsSeparator: ":",
                interpolation: {
                    unescapeSuffix: 'HTML',
                    escapeValue: false,
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -38,7 +38,9 @@
    },
    "red-ui-workspace": {
        "backspace": "core:delete-selection",
+        "ctrl-backspace": "core:delete-selection-and-reconnect",
        "delete": "core:delete-selection",
+        "ctrl-delete": "core:delete-selection-and-reconnect",
        "enter": "core:edit-selected-node",
        "ctrl-enter": "core:go-to-selection",
        "ctrl-c": "core:copy-selection-to-internal-clipboard",
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -15,6 +15,9 @@
 **/
 RED.nodes = (function() {

+    var PORT_TYPE_INPUT = 1;
+    var PORT_TYPE_OUTPUT = 0;
+
    var node_defs = {};
    var linkTabMap = {};

@@ -597,6 +600,14 @@ RED.nodes = (function() {
        RED.events.emit('nodes:add',n);
    }
    function addLink(l) {
+        if (nodeLinks[l.source.id]) {
+            const isUnique = nodeLinks[l.source.id].out.every(function(link) {
+                return link.sourcePort !== l.sourcePort || link.target.id !== l.target.id
+            })
+            if (!isUnique) {
+                return
+            }
+        }
        links.push(l);
        if (l.source) {
            // Possible the node hasn't been added yet
@@ -805,7 +816,6 @@ RED.nodes = (function() {
        var removedGroups = [];
        if (ws) {
            delete workspaces[id];
-            allNodes.removeTab(id);
            delete linkTabMap[id];
            workspacesOrder.splice(workspacesOrder.indexOf(id),1);
            var i;
@@ -843,6 +853,7 @@ RED.nodes = (function() {
            for (i=removedGroups.length-1; i>=0; i--) {
                removeGroup(removedGroups[i]);
            }
+            allNodes.removeTab(id);
            RED.events.emit('flows:remove',ws);
        }
        return {nodes:removedNodes,links:removedLinks, groups: removedGroups};
@@ -1097,6 +1108,11 @@ RED.nodes = (function() {
            // Until we know how that can happen, add a filter here to remove them
            node.nodes = node.nodes.filter(function(n) { return !!n }).map(function(n) { return n.id });
        }
+        if (n.type === "tab" || n.type === "group") {
+            if (node.env && node.env.length === 0) {
+                delete node.env;
+            }
+        }
        if (n._def.category != "config") {
            node.x = n.x;
            node.y = n.y;
@@ -2119,7 +2135,7 @@ RED.nodes = (function() {
            n = new_nodes[i];
            if (n.wires) {
                for (var w1=0;w1<n.wires.length;w1++) {
-                    var wires = (n.wires[w1] instanceof Array)?n.wires[w1]:[n.wires[w1]];
+                    var wires = (Array.isArray(n.wires[w1]))?n.wires[w1]:[n.wires[w1]];
                    for (var w2=0;w2<wires.length;w2++) {
                        if (node_map.hasOwnProperty(wires[w2])) {
                            if (n.z === node_map[wires[w2]].z) {
@@ -2453,6 +2469,144 @@ RED.nodes = (function() {
        return helpContent;
    }

+    function getNodeIslands(nodes) {
+        var selectedNodes = new Set(nodes);
+        // Maps node => island index
+        var nodeToIslandIndex = new Map();
+        // Maps island index => [nodes in island]
+        var islandIndexToNodes = new Map();
+        var internalLinks = new Set();
+        nodes.forEach((node, index) => {
+            nodeToIslandIndex.set(node,index);
+            islandIndexToNodes.set(index, [node]);
+            var inboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_INPUT);
+            var outboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_OUTPUT);
+            inboundLinks.forEach(l => {
+                if (selectedNodes.has(l.source)) {
+                    internalLinks.add(l)
+                }
+            })
+            outboundLinks.forEach(l => {
+                if (selectedNodes.has(l.target)) {
+                    internalLinks.add(l)
+                }
+            })
+        })
+
+        internalLinks.forEach(l => {
+            let source = l.source;
+            let target = l.target;
+            if (nodeToIslandIndex.get(source) !== nodeToIslandIndex.get(target)) {
+                let sourceIsland = nodeToIslandIndex.get(source);
+                let islandToMove = nodeToIslandIndex.get(target);
+                let nodesToMove = islandIndexToNodes.get(islandToMove);
+                nodesToMove.forEach(n => {
+                    nodeToIslandIndex.set(n,sourceIsland);
+                    islandIndexToNodes.get(sourceIsland).push(n);
+                })
+                islandIndexToNodes.delete(islandToMove);
+            }
+        })
+        const result = [];
+        islandIndexToNodes.forEach((nodes,index) => {
+            result.push(nodes);
+        })
+        return result;
+    }
+
+    function detachNodes(nodes) {
+        let allSelectedNodes = [];
+        nodes.forEach(node => {
+            if (node.type === 'group') {
+                let groupNodes = RED.group.getNodes(node,true,true);
+                allSelectedNodes = allSelectedNodes.concat(groupNodes);
+            } else {
+                allSelectedNodes.push(node);
+            }
+        })
+        if (allSelectedNodes.length > 0 ) {
+            const nodeIslands = RED.nodes.getNodeIslands(allSelectedNodes);
+            let removedLinks = [];
+            let newLinks = [];
+            let createdLinkIds = new Set();
+
+            nodeIslands.forEach(nodes => {
+                let selectedNodes = new Set(nodes);
+                let allInboundLinks = [];
+                let allOutboundLinks = [];
+                // Identify links that enter or exit this island of nodes
+                nodes.forEach(node => {
+                    var inboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_INPUT);
+                    var outboundLinks = RED.nodes.getNodeLinks(node, PORT_TYPE_OUTPUT);
+                    inboundLinks.forEach(l => {
+                        if (!selectedNodes.has(l.source)) {
+                            allInboundLinks.push(l)
+                        }
+                    })
+                    outboundLinks.forEach(l => {
+                        if (!selectedNodes.has(l.target)) {
+                            allOutboundLinks.push(l)
+                        }
+                    })
+                });
+
+
+                // Identify the links to restore
+                allInboundLinks.forEach(inLink => {
+                    // For Each inbound link,
+                    //  - get source node.
+                    //  - trace through to all outbound links
+                    let sourceNode = inLink.source;
+                    let targetNodes = new Set();
+                    let visited = new Set();
+                    let stack = [inLink.target];
+                    while (stack.length > 0) {
+                        let node = stack.pop(stack);
+                        visited.add(node)
+                        let links = RED.nodes.getNodeLinks(node, PORT_TYPE_OUTPUT);
+                        links.forEach(l => {
+                            if (visited.has(l.target)) {
+                                return
+                            }
+                            visited.add(l.target);
+                            if (selectedNodes.has(l.target)) {
+                                // internal link
+                                stack.push(l.target)
+                            } else {
+                                targetNodes.add(l.target)
+                            }
+                        })
+                    }
+                    targetNodes.forEach(target => {
+                        let linkId = `${sourceNode.id}[${inLink.sourcePort}] -> ${target.id}`
+                        if (!createdLinkIds.has(linkId)) {
+                            createdLinkIds.add(linkId);
+                            let link = {
+                                source: sourceNode,
+                                sourcePort: inLink.sourcePort,
+                                target: target
+                            }
+                            let existingLinks = RED.nodes.filterLinks(link)
+                            if (existingLinks.length === 0) {
+                                newLinks.push(link);
+                            }
+                        }
+                    })
+                })
+
+                // 2. delete all those links
+                allInboundLinks.forEach(l => { RED.nodes.removeLink(l); removedLinks.push(l)})
+                allOutboundLinks.forEach(l => { RED.nodes.removeLink(l); removedLinks.push(l)})
+            })
+
+            newLinks.forEach(l => RED.nodes.addLink(l));
+            return {
+                newLinks,
+                removedLinks
+            }
+        }
+    }
+
    return {
        init: function() {
            RED.events.on("registry:node-type-added",function(type) {
@@ -2534,7 +2688,7 @@ RED.nodes = (function() {
        add: addNode,
        remove: removeNode,
        clear: clear,
-
+        detachNodes: detachNodes,
        moveNodesForwards: moveNodesForwards,
        moveNodesBackwards: moveNodesBackwards,
        moveNodesToFront: moveNodesToFront,
@@ -2546,7 +2700,20 @@ RED.nodes = (function() {

        addLink: addLink,
        removeLink: removeLink,
-
+        getNodeLinks: function(id, portType) {
+            if (typeof id !== 'string') {
+                id = id.id;
+            }
+            if (nodeLinks[id]) {
+                if (portType === 1) {
+                    // Return cloned arrays so they can be safely modified by caller
+                    return [].concat(nodeLinks[id].in)
+                } else {
+                    return [].concat(nodeLinks[id].out)
+                }
+            }
+            return [];
+        },
        addWorkspace: addWorkspace,
        removeWorkspace: removeWorkspace,
        getWorkspaceOrder: function() { return workspacesOrder },
@@ -2620,6 +2787,7 @@ RED.nodes = (function() {
        getAllFlowNodes: getAllFlowNodes,
        getAllUpstreamNodes: getAllUpstreamNodes,
        getAllDownstreamNodes: getAllDownstreamNodes,
+        getNodeIslands: getNodeIslands,
        createExportableNodeSet: createExportableNodeSet,
        createCompleteNodeSet: createCompleteNodeSet,
        updateConfigNodeUsers: updateConfigNodeUsers,
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -252,8 +252,21 @@ var RED = (function() {
                        if (/^#flow\/.+$/.test(currentHash)) {
                            RED.workspaces.show(currentHash.substring(6),true);
                        }
-                        if (RED.workspaces.active() === 0 && RED.workspaces.count() > 0) {
-                            RED.workspaces.show(RED.nodes.getWorkspaceOrder()[0])
+                        if (RED.workspaces.count() > 0) {
+                            const hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                            const workspaces = RED.nodes.getWorkspaceOrder();
+                            if (RED.workspaces.active() === 0) {
+                                for (let index = 0; index < workspaces.length; index++) {
+                                    const ws = workspaces[index];
+                                    if (!hiddenTabs[ws]) {
+                                        RED.workspaces.show(ws);
+                                        break;
+                                    }
+                                }
+                            }
+                            if (RED.workspaces.active() === 0) {
+                                RED.workspaces.show(workspaces[0]);
+                            }
                        }
                    } catch(err) {
                        console.warn(err);
@@ -461,7 +474,7 @@ var RED = (function() {
            var parts = topic.split("/");
            var node = RED.nodes.node(parts[1]);
            if (node) {
-                if (msg.hasOwnProperty("text") && msg.text !== null && /^[a-zA-Z]/.test(msg.text)) {
+                if (msg.hasOwnProperty("text") && msg.text !== null && /^[@a-zA-Z]/.test(msg.text)) {
                    msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
                }
                node.status = msg;
@@ -475,31 +488,33 @@ var RED = (function() {
            var typeList;
            var info;
            if (topic == "notification/node/added") {
-                var addedTypes = [];
-                msg.forEach(function(m) {
-                    var id = m.id;
-                    RED.nodes.addNodeSet(m);
-                    addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadNodeCatalog(id, function() {
-                        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
-                        $.ajax({
-                            headers: {
-                                "Accept":"text/html",
-                                "Accept-Language": lang
-                            },
-                            cache: false,
-                            url: 'nodes/'+id,
-                            success: function(data) {
-                                appendNodeConfig(data);
-                            }
+                RED.settings.refreshSettings(function(err, data) {
+                    var addedTypes = [];
+                    msg.forEach(function(m) {
+                        var id = m.id;
+                        RED.nodes.addNodeSet(m);
+                        addedTypes = addedTypes.concat(m.types);
+                        RED.i18n.loadNodeCatalog(id, function() {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                }
+                            });
                        });
                    });
-                });
-                if (addedTypes.length) {
-                    typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                    RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
-                }
-                loadIconList();
+                    if (addedTypes.length) {
+                        typeList = "<ul><li>"+addedTypes.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                        RED.notify(RED._("palette.event.nodeAdded", {count:addedTypes.length})+typeList,"success");
+                    }
+                    loadIconList();
+                })
            } else if (topic == "notification/node/removed") {
                for (i=0;i<msg.length;i++) {
                    m = msg[i];
@@ -512,27 +527,29 @@ var RED = (function() {
                loadIconList();
            } else if (topic == "notification/node/enabled") {
                if (msg.types) {
-                    info = RED.nodes.getNodeSet(msg.id);
-                    if (info.added) {
-                        RED.nodes.enableNodeSet(msg.id);
-                        typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                        RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
-                    } else {
-                        var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
-                        $.ajax({
-                            headers: {
-                                "Accept":"text/html",
-                                "Accept-Language": lang
-                            },
-                            cache: false,
-                            url: 'nodes/'+msg.id,
-                            success: function(data) {
-                                appendNodeConfig(data);
-                                typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
-                                RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
-                            }
-                        });
-                    }
+                    RED.settings.refreshSettings(function(err, data) {
+                        info = RED.nodes.getNodeSet(msg.id);
+                        if (info.added) {
+                            RED.nodes.enableNodeSet(msg.id);
+                            typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                            RED.notify(RED._("palette.event.nodeEnabled", {count:msg.types.length})+typeList,"success");
+                        } else {
+                            var lang = localStorage.getItem("editor-language")||RED.i18n.detectLanguage();
+                            $.ajax({
+                                headers: {
+                                    "Accept":"text/html",
+                                    "Accept-Language": lang
+                                },
+                                cache: false,
+                                url: 'nodes/'+msg.id,
+                                success: function(data) {
+                                    appendNodeConfig(data);
+                                    typeList = "<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                                    RED.notify(RED._("palette.event.nodeAdded", {count:msg.types.length})+typeList,"success");
+                                }
+                            });
+                        }
+                    });
                }
            } else if (topic == "notification/node/disabled") {
                if (msg.types) {
@@ -552,8 +569,7 @@ var RED = (function() {

        $(".red-ui-header-toolbar").show();

-
-        RED.sidebar.show(":first");
+        RED.sidebar.show(":first", true);

        setTimeout(function() {
            loader.end();
@@ -586,7 +602,7 @@ var RED = (function() {
                {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
            ]});
        }
-        menuOptions.push({id:"menu-item-edit-menu", label:"Edit", options: [
+        menuOptions.push({id:"menu-item-edit-menu", label:RED._("menu.label.edit"), options: [
            {id: "menu-item-edit-undo", label:RED._("keyboard.undoChange"), disabled: true, onselect: "core:undo"},
            {id: "menu-item-edit-redo", label:RED._("keyboard.redoChange"), disabled: true, onselect: "core:redo"},
            null,
--- a/packages/node_modules/@node-red/editor-client/src/js/settings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js
@@ -125,7 +125,7 @@ RED.settings = (function () {
        load(done);
    }

-    var load = function(done) {
+    var refreshSettings = function(done) {
        $.ajax({
            headers: {
                "Accept": "application/json"
@@ -135,6 +135,23 @@ RED.settings = (function () {
            url: 'settings',
            success: function (data) {
                setProperties(data);
+                done(null, data);
+            },
+            error: function(jqXHR,textStatus,errorThrown) {
+                if (jqXHR.status === 401) {
+                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
+                        window.location.search = "";
+                    }
+                    RED.user.login(function() { refreshSettings(done); });
+                } else {
+                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
+                }
+            }
+        });
+    }
+    var load = function(done) {
+        refreshSettings(function(err, data) {
+            if (!err) {
                if (!RED.settings.user || RED.settings.user.anonymous) {
                    RED.settings.remove("auth-tokens");
                }
@@ -147,18 +164,8 @@ RED.settings = (function () {
                console.log("D3",d3.version);
                console.groupEnd();
                loadUserSettings(done);
-            },
-            error: function(jqXHR,textStatus,errorThrown) {
-                if (jqXHR.status === 401) {
-                    if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
-                        window.location.search = "";
-                    }
-                    RED.user.login(function() { load(done); });
-                } else {
-                    console.log("Unexpected error loading settings:",jqXHR.status,textStatus);
-                }
            }
-        });
+        })
    };

    function loadUserSettings(done) {
@@ -234,6 +241,7 @@ RED.settings = (function () {
        init: init,
        load: load,
        loadUserSettings: loadUserSettings,
+        refreshSettings: refreshSettings,
        set: set,
        get: get,
        remove: remove,
--- 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
@@ -160,18 +160,19 @@ RED.actionList = (function() {
                createDialog();
            }
            dialog.slideDown(300);
-            searchInput.searchBox('value',v)
+            searchInput.searchBox('value',v);
            searchResults.editableList('empty');
            results = [];
            var actions = RED.actions.list();
            actions.sort(function(A,B) {
-                return A.id.localeCompare(B.id);
+                var Akey = A.label;
+                var Bkey = B.label;
+                return Akey.localeCompare(Bkey);
            });
            actions.forEach(function(action) {
-                action.label = action.id.replace(/:/,": ").replace(/-/g," ").replace(/(^| )./g,function() { return arguments[0].toUpperCase()});
                action._label = action.label.toLowerCase();
-                searchResults.editableList('addItem',action)
-            })
+                searchResults.editableList('addItem',action);
+            });
            RED.events.emit("actionList:open");
            visible = true;
        }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
@@ -1,33 +1,39 @@
 RED.actions = (function() {
    var actions = {

-    }
+    };

-    function addAction(name,handler) {
+    function addAction(name,handler,options) {
        if (typeof handler !== 'function') {
            throw new Error("Action handler not a function");
        }
        if (actions[name]) {
            throw new Error("Cannot override existing action");
        }
-        actions[name] = handler;
+        actions[name] = {
+            handler: handler,
+            options: options,
+        };
    }
    function removeAction(name) {
        delete actions[name];
    }
    function getAction(name) {
-        return actions[name];
+        return actions[name].handler;
    }
    function invokeAction() {
        var args = Array.prototype.slice.call(arguments);
        var name = args.shift();
        if (actions.hasOwnProperty(name)) {
-            actions[name].apply(null, args);
+            var handler = actions[name].handler;
+            handler.apply(null, args);
        }
    }
    function listActions() {
        var result = [];
+        var missing = [];
        Object.keys(actions).forEach(function(action) {
+            var def = actions[action];
            var shortcut = RED.keyboard.getShortcut(action);
            var isUser = false;
            if (shortcut) {
@@ -35,13 +41,38 @@ RED.actions = (function() {
            } else {
                isUser = !!RED.keyboard.getUserShortcut(action);
            }
+            if (!def.label) {
+                var name = action;
+                var options = def.options;
+                var key = options ? options.label : undefined;
+                if (!key) {
+                    key = "action-list." +name.replace(/^.*:/,"");
+                }
+                var label = RED._(key);
+                if (label === key) {
+                    // no translation. convert `name` to description 
+                    label = name.replace(/(^.+:([a-z]))|(-([a-z]))/g, function() {
+                        if (arguments[5] === 0) {
+                            return arguments[2].toUpperCase();
+                        } else {
+                            return " "+arguments[4].toUpperCase();
+                        }
+                    });
+                    missing.push(key);
+                }
+                def.label = label;
+            }
+            //console.log("; missing:", missing);
+
            result.push({
                id:action,
                scope:shortcut?shortcut.scope:undefined,
                key:shortcut?shortcut.key:undefined,
-                user:isUser
-            })
-        })
+                user:isUser,
+                label: def.label,
+                options: def.options,
+            });
+        });
        return result;
    }
    return {
--- 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
@@ -71,6 +71,7 @@ RED.clipboard = (function() {
                        text: RED._("common.label.cancel"),
                        click: function() {
                            $( this ).dialog( "close" );
+                            RED.view.focus();
                        }
                    },
                    { // red-ui-clipboard-dialog-download
@@ -81,6 +82,7 @@ RED.clipboard = (function() {
                            var data = $("#red-ui-clipboard-dialog-export-text").val();
                            downloadData("flows.json", data);
                            $( this ).dialog( "close" );
+                            RED.view.focus();
                        }
                    },
                    { // red-ui-clipboard-dialog-export
@@ -95,6 +97,7 @@ RED.clipboard = (function() {
                                $( this ).dialog( "close" );
                                copyText(flowData);
                                RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
+                                RED.view.focus();
                            } else {
                                var flowToExport = $("#red-ui-clipboard-dialog-export-text").val();
                                var selectedPath = activeLibraries[activeTab].getSelected();
@@ -110,6 +113,7 @@ RED.clipboard = (function() {
                                        contentType: "application/json; charset=utf-8"
                                    }).done(function() {
                                        $(dialog).dialog( "close" );
+                                        RED.view.focus();
                                        RED.notify(RED._("library.exportedToLibrary"),"success");
                                    }).fail(function(xhr,textStatus,err) {
                                        if (xhr.status === 401) {
@@ -171,6 +175,7 @@ RED.clipboard = (function() {
                                }
                            }
                            $( this ).dialog( "close" );
+                            RED.view.focus();
                        }
                    },
                    { // red-ui-clipboard-dialog-import-conflict
@@ -203,6 +208,7 @@ RED.clipboard = (function() {
                            // console.table(pendingImportConfig.importNodes.map(function(n) { return {id:n.id,type:n.type,result:importMap[n.id]}}))
                            RED.view.importNodes(newNodes, pendingImportConfig.importOptions);
                            $( this ).dialog( "close" );
+                            RED.view.focus();
                        }
                    }
                ],
@@ -940,7 +946,8 @@ RED.clipboard = (function() {
        if (truncated) {
            msg += "_truncated";
        }
-        $("#red-ui-clipboard-hidden").val(value).focus().select();
+        var clipboardHidden = $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo(document.body);
+        clipboardHidden.val(value).focus().select();
        var result =  document.execCommand("copy");
        if (result && element) {
            var popover = RED.popover.create({
@@ -954,14 +961,13 @@ RED.clipboard = (function() {
            },1000);
            popover.open();
        }
-        $("#red-ui-clipboard-hidden").val("");
+        clipboardHidden.remove();
        if (currentFocus) {
            $(currentFocus).focus();
        }
        return result;
    }

-
    function importNodes(nodesStr,addFlow) {
        var newNodes = nodesStr;
        if (typeof nodesStr === 'string') {
@@ -1236,8 +1242,6 @@ RED.clipboard = (function() {
        init: function() {
            setupDialogs();

-            $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo("#red-ui-editor");
-
            RED.actions.add("core:show-export-dialog",showExportNodes);
            RED.actions.add("core:show-import-dialog",showImportNodes);

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/autoComplete.js
@@ -21,7 +21,7 @@
 *      value: String : the value to insert if selected
 *      label: String|DOM Element : the label to display in the dropdown.
 *  }
- * 
+ *
 */

    $.widget( "nodered.autoComplete", {
@@ -62,7 +62,7 @@
                maxHeight: 200,
                class: "red-ui-autoComplete-container",
                options: completions,
-                onselect: (opt) => { this.element.val(opt.value); this.element.focus() },
+                onselect: (opt) => { this.element.val(opt.value); this.element.focus(); this.element.trigger("change") },
                onclose: () => { this.completionMenuShown = false; delete this.menu; this.element.focus()}
            });
            this.menu.show({
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js
@@ -350,6 +350,15 @@ RED.popover = (function() {
            }
        }

+        target.on("remove", function (ev) {
+            if (timer) {
+                clearTimeout(timer);
+            }
+            if (active) {
+                active = false;
+                setTimeout(closePopup,delay.hide);
+            }
+        });
        if (trigger === 'hover') {
            target.on('mouseenter',function(e) {
                clearTimeout(timer);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js
@@ -117,6 +117,8 @@ RED.tabs = (function() {
                    menuOptions = options.menu()
                } else if (Array.isArray(options.menu)) {
                    menuOptions = options.menu;
+                } else if (typeof options.menu === 'function') {
+                    menuOptions = options.menu();
                }
                menu = RED.menu.init({options: menuOptions});
                menu.attr("id",options.id+"-menu");
@@ -555,28 +557,24 @@ RED.tabs = (function() {
                }
            }

-            li.one("transitionend", function(evt) {
-                li.remove();
-                if (tabs[id].pinned) {
-                    pinnedTabsCount--;
-                }
-                if (options.onremove) {
-                    options.onremove(tabs[id]);
-                }
-                delete tabs[id];
-                updateTabWidths();
-                if (collapsibleMenu) {
-                    collapsibleMenu.remove();
-                    collapsibleMenu = null;
-                }
-            })
-            li.addClass("hide-tab");
-            li.width(0);
+            li.remove();
+            if (tabs[id].pinned) {
+                pinnedTabsCount--;
+            }
+            if (options.onremove) {
+                options.onremove(tabs[id]);
+            }
+            delete tabs[id];
+            updateTabWidths();
+            if (collapsibleMenu) {
+                collapsibleMenu.remove();
+                collapsibleMenu = null;
+            }
        }

        function findPreviousVisibleTab(li) {
            if (!li) {
-                li = ul.find("li.active").parent();
+                li = ul.find("li.active");
            }
            var previous = li.prev();
            while(previous.length > 0 && previous.hasClass("hide-tab")) {
@@ -586,9 +584,9 @@ RED.tabs = (function() {
        }
        function findNextVisibleTab(li) {
            if (!li) {
-                li = ul.find("li.active").parent();
+                li = ul.find("li.active");
            }
-            var next = ul.find("li.active").next();
+            var next = li.next();
            while(next.length > 0 && next.hasClass("hide-tab")) {
                next = next.next();
            }
@@ -809,15 +807,18 @@ RED.tabs = (function() {
                        event.preventDefault();
                        removeTab(tab.id);
                    });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                }
                if (tab.hideable) {
                    li.addClass("red-ui-tabs-closeable")
-                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close"}).appendTo(li);
-                    closeLink.append('<i class="fa fa-times" />');
+                    var closeLink = $("<a/>",{href:"#",class:"red-ui-tab-close red-ui-tab-hide"}).appendTo(li);
+                    closeLink.append('<i class="fa fa-eye" />');
+                    closeLink.append('<i class="fa fa-eye-slash" />');
                    closeLink.on("click",function(event) {
                        event.preventDefault();
                        hideTab(tab.id);
                    });
+                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
                }

                var badges = $('<span class="red-ui-tabs-badges"></span>').appendTo(li);
@@ -826,7 +827,8 @@ RED.tabs = (function() {
                    $('<i class="red-ui-tabs-badge-selected fa fa-check-circle"></i>').appendTo(badges);
                }

-                link.attr("title",tab.label);
+                // link.attr("title",tab.label);
+                RED.popover.tooltip(link,function() { return RED.utils.sanitize(tab.label); });

                if (options.onadd) {
                    options.onadd(tab);
@@ -945,7 +947,6 @@ RED.tabs = (function() {
            renameTab: function(id,label) {
                tabs[id].label = label;
                var tab = ul.find("a[href='#"+id+"']");
-                tab.attr("title",label);
                tab.find("span.red-ui-text-bidi-aware").text(label).attr('dir', RED.text.bidi.resolveBaseTextDir(label));
                updateTabWidths();
            },
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js
@@ -340,7 +340,7 @@
            if (child.depth !== parent.depth+1) {
                child.depth = parent.depth+1;
                // var labelPaddingWidth = ((child.gutter ? child.gutter[0].offsetWidth + 2 : 0) + (child.depth * 20));
-                var labelPaddingWidth = ((child.gutter?child.gutter.width()+2:0)+(child.depth*20));
+                var labelPaddingWidth = (((child.gutter&&!child.gutter.hasClass("red-ui-treeList-gutter-float"))?child.gutter.width()+2:0)+(child.depth*20));
                child.treeList.labelPadding.width(labelPaddingWidth+'px');
                if (child.element) {
                    $(child.element).css({
@@ -562,8 +562,9 @@
                }).appendTo(label)

            }
-            // var labelPaddingWidth = (item.gutter?item.gutter.width()+2:0)+(depth*20);
-            var labelPaddingWidth = (item.gutter ? item.gutter[0].offsetWidth + 2 : 0) + (depth * 20)
+
+            var labelPaddingWidth = ((item.gutter&&!item.gutter.hasClass("red-ui-treeList-gutter-float"))?item.gutter.width()+2:0)+(depth*20);
+
            item.treeList.labelPadding = $('<span>').css({
                display: "inline-block",
                "flex-shrink": 0,
--- 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
@@ -419,7 +419,8 @@
            }
            nlsd = true;
            var that = this;
-
+            this.identifier = this.element.attr('id') || "TypedInput-"+Math.floor(Math.random()*100);
+            if (this.options.debug) { console.log(this.identifier,"Create",{defaultType:this.options.default, value:this.element.val()}) }
            this.disarmClick = false;
            this.input = $('<input class="red-ui-typedInput-input" type="text"></input>');
            this.input.insertAfter(this.element);
@@ -533,9 +534,9 @@
            // 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.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
-            RED.popover.tooltip(this.optionSelectLabel,function() {
-                return that.optionValue;
-            });
+            // RED.popover.tooltip(this.optionSelectLabel,function() {
+            //     return that.optionValue;
+            // });
            this.optionSelectTrigger.on("click", function(event) {
                event.preventDefault();
                event.stopPropagation();
@@ -555,7 +556,8 @@
            this.optionExpandButton = $('<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.options.default||this.typeList[0].value);
+            this.type(this.typeField.val() || this.options.default||this.typeList[0].value);
+            this.typeChanged = !!this.options.default;
        }catch(err) {
            console.log(err.stack);
        }
@@ -803,6 +805,7 @@
            var that = this;
            var currentType = this.type();
            this.typeMap = {};
+            var firstCall = (this.typeList === undefined);
            this.typeList = types.map(function(opt) {
                var result;
                if (typeof opt === 'string') {
@@ -827,10 +830,14 @@
            }
            this.menu = this._createMenu(this.typeList,{},function(v) { that.type(v) });
            if (currentType && !this.typeMap.hasOwnProperty(currentType)) {
-                this.type(this.typeList[0].value);
+                if (!firstCall) {
+                    this.type(this.typeList[0].value);
+                }
            } else {
                this.propertyType = null;
-                this.type(currentType);
+                if (!firstCall) {
+                    this.type(currentType);
+                }
            }
            if (this.typeList.length === 1 && !this.typeList[0].icon && (!this.typeList[0].label || this.typeList[0].showLabel === false)) {
                this.selectTrigger.hide()
@@ -846,7 +853,10 @@
        },
        value: function(value) {
            var that = this;
-            var opt = this.typeMap[this.propertyType];
+            // If the default type has been set to an invalid type, then on first
+            // creation, the current propertyType will not exist. Default to an
+            // empty object on the assumption the corrent type will be set shortly
+            var opt = this.typeMap[this.propertyType] || {};
            if (!arguments.length) {
                var v = this.input.val();
                if (opt.export) {
@@ -854,27 +864,38 @@
                }
                return v;
            } else {
+                if (this.options.debug) { console.log(this.identifier,"----- SET VALUE ------",value) }
                var selectedOption = [];
+                var valueToCheck = value;
                if (opt.options) {
-                    var checkValues = [value];
+                    if (opt.hasValue && opt.parse) {
+                        var parts = opt.parse(value);
+                        if (this.options.debug) { console.log(this.identifier,"new parse",parts) }
+                        value = parts.value;
+                        valueToCheck = parts.option || parts.value;
+                    }
+
+                    var checkValues = [valueToCheck];
                    if (opt.multiple) {
                        selectedOption = [];
-                        checkValues = value.split(",");
+                        checkValues = valueToCheck.split(",");
                    }
-                    checkValues.forEach(function(value) {
+                    checkValues.forEach(function(valueToCheck) {
                        for (var i=0;i<opt.options.length;i++) {
                            var op = opt.options[i];
                            if (typeof op === "string") {
-                                if (op === value || op === ""+value) {
+                                if (op === valueToCheck || op === ""+valueToCheck) {
                                    selectedOption.push(that.activeOptions[op]);
                                    break;
                                }
-                            } else if (op.value === value) {
+                            } else if (op.value === valueToCheck) {
                                selectedOption.push(op);
                                break;
                            }
                        }
                    })
+                    if (this.options.debug) { console.log(this.identifier,"set value to",value) }
+
                    this.input.val(value);
                    if (!opt.multiple) {
                        if (selectedOption.length === 0) {
@@ -899,15 +920,16 @@
                return this.propertyType;
            } else {
                var that = this;
+                if (this.options.debug) { console.log(this.identifier,"----- SET TYPE -----",type) }
                var previousValue = null;
                var opt = this.typeMap[type];
                if (opt && this.propertyType !== type) {
                    // If previousType is !null, then this is a change of the type, rather than the initialisation
                    var previousType = this.typeMap[this.propertyType];
-                    var typeChanged = !!previousType;
                    previousValue = this.input.val();

-                    if (typeChanged) {
+                    if (previousType && this.typeChanged) {
+                        if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
                        if (previousType.options && opt.hasValue !== true) {
                            this.oldValues[previousType.value] = previousValue;
                        } else if (previousType.hasValue === false) {
@@ -917,27 +939,37 @@
                        }
                        if ((opt.options && opt.hasValue !== true) || opt.hasValue === false) {
                            if (this.oldValues.hasOwnProperty(opt.value)) {
+                                if (this.options.debug) { console.log(this.identifier,"restored previous (1)",this.oldValues[opt.value]) }
                                this.input.val(this.oldValues[opt.value]);
-                            } else {
+                            } else if (opt.options) {
                                // No old value for the option type.
                                // It is possible code has called 'value' then 'type'
                                // to set the selected option. This is what the Inject/Switch/Change
                                // nodes did before 2.1.
                                // So we need to be careful to not reset the value if it is a valid option.
                                var validOptions = isOptionValueValid(opt,previousValue);
-                                if (previousValue && validOptions) {
+                                if (this.options.debug) { console.log(this.identifier,{previousValue,opt,validOptions}) }
+                                if ((previousValue || previousValue === '') && validOptions) {
+                                    if (this.options.debug) { console.log(this.identifier,"restored previous (2)") }
                                    this.input.val(previousValue);
                                } else {
                                    if (typeof opt.default === "string") {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (3)",opt.default) }
                                        this.input.val(opt.default);
                                    } else if (Array.isArray(opt.default)) {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (4)",opt.default.join(",")) }
                                        this.input.val(opt.default.join(","))
                                    } else {
+                                        if (this.options.debug) { console.log(this.identifier,"restored previous (5)") }
                                        this.input.val("");
                                    }
                                }
+                            } else {
+                                if (this.options.debug) { console.log(this.identifier,"restored default/blank",opt.default||"") }
+                                this.input.val(opt.default||"")
                            }
                        } else {
+                            if (this.options.debug) { console.log(this.identifier,"restored old/default/blank") }
                            this.input.val(this.oldValues.hasOwnProperty("_")?this.oldValues["_"]:(opt.default||""))
                        }
                        if (previousType.autoComplete) {
@@ -945,6 +977,7 @@
                        }
                    }
                    this.propertyType = type;
+                    this.typeChanged = true;
                    if (this.typeField) {
                        this.typeField.val(type);
                    }
@@ -1040,7 +1073,8 @@
                            } else {
                                var selectedOption = this.optionValue||opt.options[0];
                                if (opt.parse) {
-                                    var parts = opt.parse(this.input.val(),selectedOption);
+                                    var selectedOptionObj = typeof selectedOption === "string"?{value:selectedOption}:selectedOption
+                                    var parts = opt.parse(this.input.val(),selectedOptionObj);
                                    if (parts.option) {
                                        selectedOption = parts.option;
                                        if (!this.activeOptions.hasOwnProperty(selectedOption)) {
@@ -1064,6 +1098,7 @@
                                        this._updateOptionSelectLabel(this.activeOptions[selectedOption]);
                                    }
                                } else if (selectedOption) {
+                                    if (this.options.debug) { console.log(this.identifier,"HERE",{optionValue:selectedOption.value}) }
                                    this.optionValue = selectedOption.value;
                                    this._updateOptionSelectLabel(selectedOption);
                                } else {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@@ -319,192 +319,208 @@ RED.deploy = (function() {
            },delta);
        });
    }
-    function save(skipValidation,force) {
-        if (!$("#red-ui-header-button-deploy").hasClass("disabled")) {
-            if (!RED.user.hasPermission("flows.write")) {
-                RED.notify(RED._("user.errors.deploy"),"error");
+    function save(skipValidation, force) {
+        if ($("#red-ui-header-button-deploy").hasClass("disabled")) {
+            return; //deploy is disabled
+        }
+        if ($("#red-ui-header-shade").is(":visible")) {
+            return; //deploy is shaded
+        }
+        if (!RED.user.hasPermission("flows.write")) {
+            RED.notify(RED._("user.errors.deploy"), "error");
+            return;
+        }
+        let hasUnusedConfig = false;
+        if (!skipValidation) {
+            let hasUnknown = false;
+            let hasInvalid = false;
+            const unknownNodes = [];
+            const invalidNodes = [];
+
+            RED.nodes.eachConfig(function (node) {
+                if (node.valid === undefined) {
+                    RED.editor.validateNode(node);
+                }
+                if (!node.valid && !node.d) {
+                    invalidNodes.push(getNodeInfo(node));
+                }
+                if (node.type === "unknown") {
+                    if (unknownNodes.indexOf(node.name) == -1) {
+                        unknownNodes.push(node.name);
+                    }
+                }
+            });
+            RED.nodes.eachNode(function (node) {
+                if (!node.valid && !node.d) {
+                    invalidNodes.push(getNodeInfo(node));
+                }
+                if (node.type === "unknown") {
+                    if (unknownNodes.indexOf(node.name) == -1) {
+                        unknownNodes.push(node.name);
+                    }
+                }
+            });
+            hasUnknown = unknownNodes.length > 0;
+            hasInvalid = invalidNodes.length > 0;
+
+            const unusedConfigNodes = [];
+            RED.nodes.eachConfig(function (node) {
+                if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
+                    unusedConfigNodes.push(getNodeInfo(node));
+                    hasUnusedConfig = true;
+                }
+            });
+
+            let showWarning = false;
+            let notificationMessage;
+            let notificationButtons = [];
+            let notification;
+            if (hasUnknown && !ignoreDeployWarnings.unknown) {
+                showWarning = true;
+                notificationMessage = "<p>" + RED._('deploy.confirm.unknown') + "</p>" +
+                    '<ul class="red-ui-deploy-dialog-confirm-list"><li>' + cropList(unknownNodes).map(function (n) { return sanitize(n) }).join("</li><li>") + "</li></ul><p>" +
+                    RED._('deploy.confirm.confirm') +
+                    "</p>";
+
+                notificationButtons = [
+                    {
+                        id: "red-ui-deploy-dialog-confirm-deploy-deploy",
+                        text: RED._("deploy.confirm.button.confirm"),
+                        class: "primary",
+                        click: function () {
+                            save(true);
+                            notification.close();
+                        }
+                    }
+                ];
+            } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
+                showWarning = true;
+                invalidNodes.sort(sortNodeInfo);
+
+                notificationMessage = "<p>" + RED._('deploy.confirm.improperlyConfigured') + "</p>" +
+                    '<ul class="red-ui-deploy-dialog-confirm-list"><li>' + cropList(invalidNodes.map(function (A) { return sanitize((A.tab ? "[" + A.tab + "] " : "") + A.label + " (" + A.type + ")") })).join("</li><li>") + "</li></ul><p>" +
+                    RED._('deploy.confirm.confirm') +
+                    "</p>";
+                notificationButtons = [
+                    {
+                        id: "red-ui-deploy-dialog-confirm-deploy-deploy",
+                        text: RED._("deploy.confirm.button.confirm"),
+                        class: "primary",
+                        click: function () {
+                            save(true);
+                            notification.close();
+                        }
+                    }
+                ];
+            }
+            if (showWarning) {
+                notificationButtons.unshift(
+                    {
+                        text: RED._("common.label.cancel"),
+                        click: function () {
+                            notification.close();
+                        }
+                    }
+                );
+                notification = RED.notify(notificationMessage, {
+                    modal: true,
+                    fixed: true,
+                    buttons: notificationButtons
+                });
                return;
            }
-            if (!skipValidation) {
-                var hasUnknown = false;
-                var hasInvalid = false;
-                var hasUnusedConfig = false;
-
-                var unknownNodes = [];
-                var invalidNodes = [];
-
-                RED.nodes.eachNode(function(node) {
-                    if (!node.valid && !node.d) {
-                        invalidNodes.push(getNodeInfo(node));
-                    }
-                    if (node.type === "unknown") {
-                        if (unknownNodes.indexOf(node.name) == -1) {
-                            unknownNodes.push(node.name);
-                        }
-                    }
-                });
-                hasUnknown = unknownNodes.length > 0;
-                hasInvalid = invalidNodes.length > 0;
-
-                var unusedConfigNodes = [];
-                RED.nodes.eachConfig(function(node) {
-                    if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
-                        unusedConfigNodes.push(getNodeInfo(node));
-                        hasUnusedConfig = true;
-                    }
-                });
-
-                var showWarning = false;
-                var notificationMessage;
-                var notificationButtons = [];
-                var notification;
-                if (hasUnknown && !ignoreDeployWarnings.unknown) {
-                    showWarning = true;
-                    notificationMessage = "<p>"+RED._('deploy.confirm.unknown')+"</p>"+
-                        '<ul class="red-ui-deploy-dialog-confirm-list"><li>'+cropList(unknownNodes).map(function(n) { return sanitize(n) }).join("</li><li>")+"</li></ul><p>"+
-                        RED._('deploy.confirm.confirm')+
-                        "</p>";
-
-                    notificationButtons= [
-                        {
-                            id: "red-ui-deploy-dialog-confirm-deploy-deploy",
-                            text: RED._("deploy.confirm.button.confirm"),
-                            class: "primary",
-                            click: function() {
-                                save(true);
-                                notification.close();
-                            }
-                        }
-                    ];
-                } else if (hasInvalid && !ignoreDeployWarnings.invalid) {
-                    showWarning = true;
-                    invalidNodes.sort(sortNodeInfo);
-
-                    notificationMessage = "<p>"+RED._('deploy.confirm.improperlyConfigured')+"</p>"+
-                        '<ul class="red-ui-deploy-dialog-confirm-list"><li>'+cropList(invalidNodes.map(function(A) { return sanitize( (A.tab?"["+A.tab+"] ":"")+A.label+" ("+A.type+")")})).join("</li><li>")+"</li></ul><p>"+
-                        RED._('deploy.confirm.confirm')+
-                        "</p>";
-                    notificationButtons= [
-                        {
-                            id: "red-ui-deploy-dialog-confirm-deploy-deploy",
-                            text: RED._("deploy.confirm.button.confirm"),
-                            class: "primary",
-                            click: function() {
-                                save(true);
-                                notification.close();
-                            }
-                        }
-                    ];
-                }
-                if (showWarning) {
-                    notificationButtons.unshift(
-                        {
-                            text: RED._("common.label.cancel"),
-                            click: function() {
-                                notification.close();
-                            }
-                        }
-                    );
-                    notification = RED.notify(notificationMessage,{
-                        modal: true,
-                        fixed: true,
-                        buttons:notificationButtons
-                    });
-                    return;
-                }
-            }
-
-            var nns = RED.nodes.createCompleteNodeSet();
-
-            var startTime = Date.now();
-            $(".red-ui-deploy-button-content").css('opacity',0);
-            $(".red-ui-deploy-button-spinner").show();
-            $("#red-ui-header-button-deploy").addClass("disabled");
-
-            var data = {flows:nns};
-
-            if (!force) {
-                data.rev = RED.nodes.version();
-            }
-
-            deployInflight = true;
-            $("#red-ui-header-shade").show();
-            $("#red-ui-editor-shade").show();
-            $("#red-ui-palette-shade").show();
-            $("#red-ui-sidebar-shade").show();
-            $.ajax({
-                url:"flows",
-                type: "POST",
-                data: JSON.stringify(data),
-                contentType: "application/json; charset=utf-8",
-                headers: {
-                    "Node-RED-Deployment-Type":deploymentType
-                }
-            }).done(function(data,textStatus,xhr) {
-                RED.nodes.dirty(false);
-                RED.nodes.version(data.rev);
-                RED.nodes.originalFlow(nns);
-                if (hasUnusedConfig) {
-                    RED.notify(
-                    '<p>'+RED._("deploy.successfulDeploy")+'</p>'+
-                    '<p>'+RED._("deploy.unusedConfigNodes")+' <a href="#" onclick="RED.sidebar.config.show(true); return false;">'+RED._("deploy.unusedConfigNodesLink")+'</a></p>',"success",false,6000);
-                } else {
-                    RED.notify('<p>'+RED._("deploy.successfulDeploy")+'</p>',"success");
-                }
-                RED.nodes.eachNode(function(node) {
-                    if (node.changed) {
-                        node.dirty = true;
-                        node.changed = false;
-                    }
-                    if (node.moved) {
-                        node.dirty = true;
-                        node.moved = false;
-                    }
-                    if(node.credentials) {
-                        delete node.credentials;
-                    }
-                });
-                RED.nodes.eachConfig(function (confNode) {
-                    confNode.changed = false;
-                    if (confNode.credentials) {
-                        delete confNode.credentials;
-                    }
-                });
-                RED.nodes.eachSubflow(function(subflow) {
-                    subflow.changed = false;
-                });
-                RED.nodes.eachWorkspace(function(ws) {
-                    ws.changed = false;
-                });
-                // Once deployed, cannot undo back to a clean state
-                RED.history.markAllDirty();
-                RED.view.redraw();
-                RED.events.emit("deploy");
-            }).fail(function(xhr,textStatus,err) {
-                RED.nodes.dirty(true);
-                $("#red-ui-header-button-deploy").removeClass("disabled");
-                if (xhr.status === 401) {
-                    RED.notify(RED._("deploy.deployFailed",{message:RED._("user.notAuthorized")}),"error");
-                } else if (xhr.status === 409) {
-                    resolveConflict(nns, true);
-                } else if (xhr.responseText) {
-                    RED.notify(RED._("deploy.deployFailed",{message:xhr.responseText}),"error");
-                } else {
-                    RED.notify(RED._("deploy.deployFailed",{message:RED._("deploy.errors.noResponse")}),"error");
-                }
-            }).always(function() {
-                deployInflight = false;
-                var delta = Math.max(0,300-(Date.now()-startTime));
-                setTimeout(function() {
-                    $(".red-ui-deploy-button-content").css('opacity',1);
-                    $(".red-ui-deploy-button-spinner").hide();
-                    $("#red-ui-header-shade").hide();
-                    $("#red-ui-editor-shade").hide();
-                    $("#red-ui-palette-shade").hide();
-                    $("#red-ui-sidebar-shade").hide();
-                },delta);
-            });
        }
+
+        const nns = RED.nodes.createCompleteNodeSet();
+        const startTime = Date.now();
+
+        $(".red-ui-deploy-button-content").css('opacity', 0);
+        $(".red-ui-deploy-button-spinner").show();
+        $("#red-ui-header-button-deploy").addClass("disabled");
+
+        const data = { flows: nns };
+
+        if (!force) {
+            data.rev = RED.nodes.version();
+        }
+
+        deployInflight = true;
+        $("#red-ui-header-shade").show();
+        $("#red-ui-editor-shade").show();
+        $("#red-ui-palette-shade").show();
+        $("#red-ui-sidebar-shade").show();
+        $.ajax({
+            url: "flows",
+            type: "POST",
+            data: JSON.stringify(data),
+            contentType: "application/json; charset=utf-8",
+            headers: {
+                "Node-RED-Deployment-Type": deploymentType
+            }
+        }).done(function (data, textStatus, xhr) {
+            RED.nodes.dirty(false);
+            RED.nodes.version(data.rev);
+            RED.nodes.originalFlow(nns);
+            if (hasUnusedConfig) {
+                RED.notify(
+                    '<p>' + RED._("deploy.successfulDeploy") + '</p>' +
+                    '<p>' + RED._("deploy.unusedConfigNodes") + ' <a href="#" onclick="RED.sidebar.config.show(true); return false;">' + RED._("deploy.unusedConfigNodesLink") + '</a></p>', "success", false, 6000);
+            } else {
+                RED.notify('<p>' + RED._("deploy.successfulDeploy") + '</p>', "success");
+            }
+            RED.nodes.eachNode(function (node) {
+                if (node.changed) {
+                    node.dirty = true;
+                    node.changed = false;
+                }
+                if (node.moved) {
+                    node.dirty = true;
+                    node.moved = false;
+                }
+                if (node.credentials) {
+                    delete node.credentials;
+                }
+            });
+            RED.nodes.eachConfig(function (confNode) {
+                confNode.changed = false;
+                if (confNode.credentials) {
+                    delete confNode.credentials;
+                }
+            });
+            RED.nodes.eachSubflow(function (subflow) {
+                subflow.changed = false;
+            });
+            RED.nodes.eachWorkspace(function (ws) {
+                ws.changed = false;
+            });
+            // Once deployed, cannot undo back to a clean state
+            RED.history.markAllDirty();
+            RED.view.redraw();
+            RED.events.emit("deploy");
+        }).fail(function (xhr, textStatus, err) {
+            RED.nodes.dirty(true);
+            $("#red-ui-header-button-deploy").removeClass("disabled");
+            if (xhr.status === 401) {
+                RED.notify(RED._("deploy.deployFailed", { message: RED._("user.notAuthorized") }), "error");
+            } else if (xhr.status === 409) {
+                resolveConflict(nns, true);
+            } else if (xhr.responseText) {
+                RED.notify(RED._("deploy.deployFailed", { message: xhr.responseText }), "error");
+            } else {
+                RED.notify(RED._("deploy.deployFailed", { message: RED._("deploy.errors.noResponse") }), "error");
+            }
+        }).always(function () {
+            deployInflight = false;
+            const delta = Math.max(0, 300 - (Date.now() - startTime));
+            setTimeout(function () {
+                $(".red-ui-deploy-button-content").css('opacity', 1);
+                $(".red-ui-deploy-button-spinner").hide();
+                $("#red-ui-header-shade").hide();
+                $("#red-ui-editor-shade").hide();
+                $("#red-ui-palette-shade").hide();
+                $("#red-ui-sidebar-shade").hide();
+            }, delta);
+        });
    }
    return {
        init: init,
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -554,6 +554,8 @@ RED.diff = (function() {
                    color: "#DDAA99",
                    defaults:{name:{value:""}}
                }
+            } else if (node.type === "group") {
+                def = RED.group.def;
            } else {
                def = {};
            }
@@ -763,16 +765,15 @@ RED.diff = (function() {
            }
        }

-
        if (node.hasOwnProperty('x')) {
            if (localNode) {
-                if (localNode.x !== node.x || localNode.y !== node.y) {
+                if (localNode.x !== node.x || localNode.y !== node.y || localNode.w !== node.w || localNode.h !== node.h ) {
                    localChanged = true;
                    localChanges++;
                }
            }
            if (remoteNode) {
-                if (remoteNode.x !== node.x || remoteNode.y !== node.y) {
+                if (remoteNode.x !== node.x || remoteNode.y !== node.y|| remoteNode.w !== node.w || remoteNode.h !== node.h) {
                    remoteChanged = true;
                    remoteChanges++;
                }
@@ -790,7 +791,12 @@ RED.diff = (function() {
                localCell.addClass("red-ui-diff-status-"+(localChanged?"changed":"unchanged"));
                $('<span class="red-ui-diff-status">'+(localChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(localCell);
                element = $('<span class="red-ui-diff-list-element"></span>').appendTo(localCell);
-                propertyElements['local.position'] = RED.utils.createObjectElement({x:localNode.x,y:localNode.y},
+                var localPosition = {x:localNode.x,y:localNode.y};
+                if (localNode.hasOwnProperty('w')) {
+                    localPosition.w = localNode.w;
+                    localPosition.h = localNode.h;
+                }
+                propertyElements['local.position'] = RED.utils.createObjectElement(localPosition,
                    {
                        path: "position",
                        exposeApi: true,
@@ -811,7 +817,12 @@ RED.diff = (function() {
                if (remoteNode) {
                    $('<span class="red-ui-diff-status">'+(remoteChanged?'<i class="fa fa-square"></i>':'')+'</span>').appendTo(remoteCell);
                    element = $('<span class="red-ui-diff-list-element"></span>').appendTo(remoteCell);
-                    propertyElements['remote.position'] = RED.utils.createObjectElement({x:remoteNode.x,y:remoteNode.y},
+                    var remotePosition = {x:remoteNode.x,y:remoteNode.y};
+                    if (remoteNode.hasOwnProperty('w')) {
+                        remotePosition.w = remoteNode.w;
+                        remotePosition.h = remoteNode.h;
+                    }
+                    propertyElements['remote.position'] = RED.utils.createObjectElement(remotePosition,
                        {
                            path: "position",
                            exposeApi: true,
@@ -883,11 +894,11 @@ RED.diff = (function() {
                }
            }
        }
-        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
+        var properties = Object.keys(node).filter(function(p) { return p!='inputLabels'&&p!='outputLabels'&&p!='z'&&p!='wires'&&p!=='x'&&p!=='y'&&p!=='w'&&p!=='h'&&p!=='id'&&p!=='type'&&(!def.defaults||!def.defaults.hasOwnProperty(p))});
        if (def.defaults) {
            properties = properties.concat(Object.keys(def.defaults));
        }
-        if (node.type !== 'tab') {
+        if (node.type !== 'tab' && node.type !== "group") {
            properties = properties.concat(['inputLabels','outputLabels']);
        }
        if ( ((localNode && localNode.hasOwnProperty('icon')) || (remoteNode && remoteNode.hasOwnProperty('icon'))) &&
--- 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
@@ -744,7 +744,16 @@ RED.editor = (function() {
                    delete cn.__label__;
                });

-                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:type})+'</option>');
+                var label = type;
+                if (typeof node_def.paletteLabel !== "undefined") {
+                    try {
+                        label = RED.utils.sanitize((typeof node_def.paletteLabel === "function" ? node_def.paletteLabel.call(node_def) : node_def.paletteLabel)||type);
+                    } catch(err) {
+                        console.log("Definition error: "+type+".paletteLabel",err);
+                    }
+                }
+
+                select.append('<option value="_ADD_"'+(value===""?" selected":"")+'>'+RED._("editor.addNewType", {type:label})+'</option>');
                window.setTimeout(function() { select.trigger("change");},50);
            }
        }
--- 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
@@ -577,7 +577,7 @@ RED.editor.codeEditor.monaco = (function() {
                    createMonacoCompletionItem("set (flow context)", 'flow.set("${1:name}", ${1:value});','Set a value in flow context',range),
                    createMonacoCompletionItem("get (global context)", 'global.get("${1:name}");','Get a value from global context',range),
                    createMonacoCompletionItem("set (global context)", 'global.set("${1:name}", ${1:value});','Set a value in global context',range),
-                    createMonacoCompletionItem("get (env)", 'env.get("${1:name}");','Get env variable value',range),
+                    createMonacoCompletionItem("get (env)", 'env.get("${1|NR_NODE_ID,NR_NODE_NAME,NR_NODE_PATH,NR_GROUP_ID,NR_GROUP_NAME,NR_FLOW_ID,NR_FLOW_NAME|}");','Get env variable value',range),
                    createMonacoCompletionItem("cloneMessage (RED.util)", 'RED.util.cloneMessage(${1:msg});',
                        ["```typescript",
                        "RED.util.cloneMessage<T extends registry.NodeMessage>(msg: T): T",
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/envVarList.js
@@ -41,8 +41,12 @@ RED.editor.envVarList = (function() {
                        style: "width:100%",
                        class: "node-input-env-value",
                        type: "text",
-                    }).attr("autocomplete","disable").appendTo(envRow)
-                    valueField.typedInput({default:'str',types:isTemplateNode?DEFAULT_ENV_TYPE_LIST:DEFAULT_ENV_TYPE_LIST_INC_CRED});
+                    }).attr("autocomplete","disable").appendTo(envRow);
+                    var types = (opt.ui && opt.ui.opts && opt.ui.opts.types);
+                    if (!types) {
+                        types = isTemplateNode ? DEFAULT_ENV_TYPE_LIST : DEFAULT_ENV_TYPE_LIST_INC_CRED;
+                    }
+                    valueField.typedInput({default:'str',types:types});
                    valueField.typedInput('type', opt.type);
                    if (opt.type === "cred") {
                        if (opt.value) {
@@ -94,6 +98,11 @@ RED.editor.envVarList = (function() {
                        }
                        opt.ui.label = opt.ui.label || {};
                        opt.ui.type = opt.ui.type || "input";
+                        if ((opt.ui.type === "cred") &&
+                            opt.ui.opts &&
+                            opt.ui.opts.types) {
+                            opt.ui.type = "input";
+                        }

                        var uiRow = $('<div/>').appendTo(container).hide();
                        // save current info for reverting on cancel
--- 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
@@ -247,7 +247,7 @@
                        var currentExpression = expressionEditor.getValue();
                        var expr;
                        var usesContext = false;
-                        var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
+                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                        $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                        try {
                            expr = jsonata(currentExpression);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
@@ -81,7 +81,8 @@
                            clearTimeout: true,
                            setInterval: true,
                            clearInterval: true
-                        }
+                        },
+                        extraLibs: options.extraLibs
                    });
                    if (options.cursor) {
                        expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -168,7 +168,7 @@
                'b': { before:"**", after: "**", tooltip: RED._("markdownEditor.bold")},
                'i': { before:"_", after: "_", tooltip: RED._("markdownEditor.italic")},
                'code': { before:"`", after: "`", tooltip: RED._("markdownEditor.code")},
-                'ol': { before:" * ", newline: true, tooltip: RED._("markdownEditor.ordered-list")},
+                'ol': { before:" 1. ", newline: true, tooltip: RED._("markdownEditor.ordered-list")},
                'ul': { before:" - ", newline: true, tooltip: RED._("markdownEditor.unordered-list")},
                'bq': { before:"> ", newline: true, tooltip: RED._("markdownEditor.quote")},
                'link': { before:"[", after: "]()", tooltip: RED._("markdownEditor.link")},
--- 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
@@ -35,9 +35,9 @@
                    editState.changed = true;
                }
                if (!node._def.defaults || !node._def.defaults.hasOwnProperty("icon")) {
-                    var icon = $("#red-ui-editor-node-icon").val()||""
+                    var icon = $("#red-ui-editor-node-icon").val()||"";
                    if (!this.isDefaultIcon) {
-                        if (icon !== node.icon) {
+                        if ((node.icon && icon !== node.icon) || (!node.icon && icon !== "")) {
                            editState.changes.icon = node.icon;
                            node.icon = icon;
                            editState.changed = true;
@@ -101,14 +101,14 @@
                    if (showLabel) {
                        // Default to show label
                        if (node.l !== false) {
-                            editState.changes.l = node.l
+                            editState.changes.l = node.l;
                            editState.changed = true;
                        }
                        node.l = false;
                    } else {
                        // Node has showLabel:false (eg link nodes)
                        if (node.hasOwnProperty('l') && node.l) {
-                            editState.changes.l = node.l
+                            editState.changes.l = node.l;
                            editState.changed = true;
                        }
                        delete node.l;
@@ -118,20 +118,20 @@
                    if (showLabel) {
                        // Default to show label
                        if (node.hasOwnProperty('l') && !node.l) {
-                            editState.changes.l = node.l
+                            editState.changes.l = node.l;
                            editState.changed = true;
                        }
                        delete node.l;
                    } else {
                        if (!node.l) {
-                            editState.changes.l = node.l
+                            editState.changes.l = node.l;
                            editState.changed = true;
                        }
                        node.l = true;
                    }
                }
            }
-        }
+        };
    });

    function buildAppearanceForm(container,node) {
@@ -164,10 +164,10 @@
            var categories = RED.palette.getCategories();
            categories.sort(function(A,B) {
                return A.label.localeCompare(B.label);
-            })
+            });
            categories.forEach(function(cat) {
                categorySelector.append($("<option/>").val(cat.id).text(cat.label));
-            })
+            });
            categorySelector.append($("<option/>").attr('disabled',true).text("---"));
            categorySelector.append($("<option/>").val("_custom_").text(RED._("palette.addCategory")));

@@ -180,7 +180,7 @@
                    $("#subflow-appearance-input-category").width(250);
                    $("#subflow-appearance-input-custom-category").hide();
                }
-            })
+            });

            $("#subflow-appearance-input-category").val(node.category||"subflows");
            var userCount = 0;
@@ -204,7 +204,7 @@
        $("#node-input-show-label").toggleButton({
            enabledLabel: RED._("editor.show"),
            disabledLabel: RED._("editor.hide")
-        })
+        });

        if (!node.hasOwnProperty("l")) {
            // Show label unless def.showLabel set to false
@@ -230,7 +230,7 @@
                "#E9967A", "#F3B567", "#FDD0A2",
                "#FDF0C2", "#FFAAAA", "#FFCC66",
                "#FFF0F0", "#FFFFFF"
-            ]
+            ];

            RED.editor.colorPicker.create({
                id: "red-ui-editor-node-color",
@@ -245,9 +245,9 @@
                nodeDiv.css('backgroundColor',colour);
                var borderColor = RED.utils.getDarkerColor(colour);
                if (borderColor !== colour) {
-                    nodeDiv.css('border-color',borderColor)
+                    nodeDiv.css('border-color',borderColor);
                }
-            })
+            });
        }


@@ -264,7 +264,7 @@
            nodeDiv.css('backgroundColor',colour);
            var borderColor = RED.utils.getDarkerColor(colour);
            if (borderColor !== colour) {
-                nodeDiv.css('border-color',borderColor)
+                nodeDiv.css('border-color',borderColor);
            }

            var iconContainer = $('<div/>',{class:"red-ui-palette-icon-container"}).appendTo(nodeDiv);
@@ -292,7 +292,7 @@

            RED.popover.tooltip(iconButton, function() {
                return $("#red-ui-editor-node-icon").val() || RED._("editor.default");
-            })
+            });
            $('<input type="hidden" id="red-ui-editor-node-icon">').val(node.icon).appendTo(iconRow);
        }

@@ -417,11 +417,11 @@
            });
            rows.sort(function(A,B) {
                return A.i-B.i;
-            })
+            });
            rows.forEach(function(r,i) {
                r.r.find("label").text((i+1)+".");
                r.r.appendTo(outputsDiv);
-            })
+            });
            if (rows.length === 0) {
                buildLabelRow("output",i,"").appendTo(outputsDiv);
            } else {
@@ -467,7 +467,7 @@
            clear.on("click", function(evt) {
                evt.preventDefault();
                input.val("");
-            })
+            });
        }
        return result;
    }
@@ -501,6 +501,12 @@
            }
            var v = $(this).val();
            hasNonBlankLabel = hasNonBlankLabel || v!== "";
+
+            // mark changed output port labels as dirty
+            if (node.type === "subflow" && (!node.outputLabels || node.outputLabels[index] !== v)) {
+                node.out[index].dirty = true;
+            }
+
            newValue[index] = v;
        });

@@ -509,6 +515,12 @@
            changes.outputLabels = node.outputLabels;
            node.outputLabels = newValue;
            changed = true;
+
+            // trigger redraw of dirty port labels
+            if (node.type === "subflow") {
+                RED.view.redraw();
+            }
+
        }
        return changed;
    }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/envVarProperties.js
@@ -55,9 +55,15 @@
                        }
                    });
                }
-                if (!isSameObj(old_env, new_env)) {
-                    node.env = new_env;
+                if (!old_env && new_env.length === 0) {
+                    delete node.env;
+                } else if (!isSameObj(old_env, new_env)) {
                    editState.changes.env = node.env;
+                    if (new_env.length === 0) {
+                        delete node.env;
+                    } else {
+                        node.env = new_env;
+                    }
                    editState.changed = true;
                }
            }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/properties.js
@@ -107,7 +107,7 @@
                                        newValue = "";
                                    }
                                }
-                                if (node[d] != newValue) {
+                                if (!isEqual(node[d], newValue)) {
                                    if (node._def.defaults[d].type) {
                                        // Change to a related config node
                                        var configNode = RED.nodes.node(node[d]);
@@ -139,6 +139,23 @@
        }
    });

+    /**
+     * Compares `newValue` with `originalValue` for equality.  
+     * @param {*} originalValue Original value
+     * @param {*} newValue New value
+     * @returns {boolean} true if originalValue equals newValue, otherwise false
+     */
+     function isEqual(originalValue, newValue) {
+        try {
+            if(originalValue == newValue) {
+                return true; 
+            }
+            return JSON.stringify(originalValue) === JSON.stringify(newValue);
+        } catch (err) {
+            return false;
+        }
+    }
+
    /**
     * Update the node credentials from the edit form
     * @param node - the node containing the credentials
--- 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
@@ -323,9 +323,6 @@ RED.group = (function() {
                groups: [ ],
                dirty: RED.nodes.dirty()
            }
-            RED.history.push(historyEvent);
-
-
            groups.forEach(function(g) {
                newSelection = newSelection.concat(ungroup(g))
                historyEvent.groups.push(g);
@@ -590,12 +587,14 @@ RED.group = (function() {
        markDirty(group);
    }

-    function getNodes(group,recursive) {
+    function getNodes(group,recursive,excludeGroup) {
        var nodes = [];
        group.nodes.forEach(function(n) {
-            nodes.push(n);
+            if (n.type !== 'group' || !excludeGroup) {
+                nodes.push(n);
+            }
            if (recursive && n.type === 'group') {
-                nodes = nodes.concat(getNodes(n,recursive))
+                nodes = nodes.concat(getNodes(n,recursive,excludeGroup))
            }
        })
        return nodes;
--- 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
@@ -49,15 +49,15 @@ RED.keyboard = (function() {
        "]": 221,
        "{": 219,// <- QWERTY specific
        "}": 221 // <- QWERTY specific
-    }
+    };
    var metaKeyCodes = {
        16: true,
        17: true,
        18: true,
        91: true,
        93: true
-    }
-    var actionToKeyMap = {}
+    };
+    var actionToKeyMap = {};
    var defaultKeyMap = {};

    // FF generates some different keycodes because reasons.
@@ -65,7 +65,7 @@ RED.keyboard = (function() {
        59:186,
        61:187,
        173:189
-    }
+    };

    function migrateOldKeymap() {
        // pre-0.18
@@ -80,7 +80,7 @@ RED.keyboard = (function() {
    }

    function getUserKey(action) {
-        return RED.settings.get('editor.keymap',{})[action]
+        return RED.settings.get('editor.keymap',{})[action];
    }

    function mergeKeymaps(defaultKeymap, themeKeymap) {
@@ -105,7 +105,7 @@ RED.keyboard = (function() {
                                scope:scope,
                                key:key,
                                user:false
-                            })
+                            });
                        }
                    }
                }
@@ -115,13 +115,13 @@ RED.keyboard = (function() {
            if (themeKeymap.hasOwnProperty(action)) {
                if (!themeKeymap[action].key) {
                    // No key for this action - default is no keybinding
-                    delete mergedKeymap[action]
+                    delete mergedKeymap[action];
                } else {
                    mergedKeymap[action] = [{
                        scope: themeKeymap[action].scope || "*",
                        key: themeKeymap[action].key,
                        user: false
-                    }]
+                    }];
                    if (mergedKeymap[action][0].scope === "workspace") {
                        mergedKeymap[action][0].scope = "red-ui-workspace";
                    }
@@ -179,7 +179,7 @@ RED.keyboard = (function() {
            close: function() {
                RED.menu.refreshShortcuts();
            }
-        })
+        });
    }

    function revertToDefault(action) {
@@ -327,7 +327,7 @@ RED.keyboard = (function() {
                        scope:scope,
                        key:key,
                        user:false
-                    }
+                    };
                }
                if (!ondown) {
                    var userAction = getUserKey(cbdown);
@@ -350,7 +350,7 @@ RED.keyboard = (function() {
                }
            }
        } else {
-            keys.push([key,mod])
+            keys.push([key,mod]);
        }
        var slot = handlers;
        for (i=0;i<keys.length;i++) {
@@ -373,7 +373,7 @@ RED.keyboard = (function() {
            //slot[key] = {scope: scope, ondown:cbdown};
        }
        slot.handlers = slot.handlers || [];
-        slot.handlers.push({scope:scope,ondown:cbdown})
+        slot.handlers.push({scope:scope,ondown:cbdown});
        slot.scope = scope;
        slot.ondown = cbdown;
    }
@@ -390,12 +390,12 @@ RED.keyboard = (function() {
                if (parsedKey) {
                    keys.push(parsedKey);
                } else {
-                    console.log("Unrecognised key specifier:",key)
+                    console.log("Unrecognised key specifier:",key);
                    return;
                }
            }
        } else {
-            keys.push([key,mod])
+            keys.push([key,mod]);
        }
        var slot = handlers;
        for (i=0;i<keys.length;i++) {
@@ -417,7 +417,7 @@ RED.keyboard = (function() {
        }
        if (typeof slot.ondown === "string") {
            if (typeof modifiers === 'boolean' && modifiers) {
-                actionToKeyMap[slot.ondown] = {user: modifiers}
+                actionToKeyMap[slot.ondown] = {user: modifiers};
            } else {
                delete actionToKeyMap[slot.ondown];
            }
@@ -433,11 +433,11 @@ RED.keyboard = (function() {
    function formatKey(key,plain) {
        var formattedKey = isMac?key.replace(/ctrl-?/,"&#8984;"):key;
        formattedKey = isMac?formattedKey.replace(/alt-?/,"&#8997;"):key;
-        formattedKey = formattedKey.replace(/shift-?/,"&#8679;")
-        formattedKey = formattedKey.replace(/left/,"&#x2190;")
-        formattedKey = formattedKey.replace(/up/,"&#x2191;")
-        formattedKey = formattedKey.replace(/right/,"&#x2192;")
-        formattedKey = formattedKey.replace(/down/,"&#x2193;")
+        formattedKey = formattedKey.replace(/shift-?/,"&#8679;");
+        formattedKey = formattedKey.replace(/left/,"&#x2190;");
+        formattedKey = formattedKey.replace(/up/,"&#x2191;");
+        formattedKey = formattedKey.replace(/right/,"&#x2192;");
+        formattedKey = formattedKey.replace(/down/,"&#x2193;");
        if (plain) {
            return formattedKey;
        }
@@ -461,7 +461,6 @@ RED.keyboard = (function() {
        var container = $(this);
        var object = container.data('data');

-
        if (!container.hasClass('keyboard-shortcut-entry-expanded')) {
            endEditShortcut();

@@ -485,7 +484,7 @@ RED.keyboard = (function() {
                }
                $(this).toggleClass("input-error",!valid);
                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);
            scopeSelect.i18n();
@@ -495,7 +494,7 @@ RED.keyboard = (function() {
            scopeSelect.val(object.scope||'*');
            scopeSelect.on("change", function() {
                keyInput.trigger("change");
-            })
+            });

            var div = $('<div class="keyboard-shortcut-edit button-group-vertical"></div>').appendTo(scope);
            var okButton = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-check"></i></button>').appendTo(div);
@@ -521,10 +520,13 @@ RED.keyboard = (function() {
                    id:object.id,
                    scope:shortcut?shortcut.scope:undefined,
                    key:shortcut?shortcut.key:undefined,
-                    user:shortcut?shortcut.user:undefined
-                }
+                    user:shortcut?shortcut.user:undefined,
+
+                    label: object.label,
+                    options: object.options,
+                };
                buildShortcutRow(container,obj);
-            })
+            });

            keyInput.trigger("focus");
        }
@@ -559,7 +561,7 @@ RED.keyboard = (function() {
                            delete object.scope;
                        } else {
                            keyDiv.parent().removeClass("keyboard-shortcut-entry-unassigned");
-                            keyDiv.append(RED.keyboard.formatKey(key))
+                            keyDiv.append(RED.keyboard.formatKey(key));
                            $("<span>").text(scope).appendTo(scopeDiv);
                            object.key = key;
                            object.scope = scope;
@@ -572,7 +574,7 @@ RED.keyboard = (function() {
                        userKeymap[object.id] = {
                            scope:shortcut.scope,
                            key:shortcut.key
-                        }
+                        };
                        RED.settings.set('editor.keymap',userKeymap);
                    }
                }
@@ -588,13 +590,7 @@ RED.keyboard = (function() {
        var item = $('<div class="keyboard-shortcut-entry">').appendTo(container);
        container.data('data',object);

-        var text = object.id.replace(/(^.+:([a-z]))|(-([a-z]))/g,function() {
-            if (arguments[5] === 0) {
-                return arguments[2].toUpperCase();
-            } else {
-                return " "+arguments[4].toUpperCase();
-            }
-        });
+        var text = object.label;
        var label = $('<div>').addClass("keyboard-shortcut-entry-text").text(text).appendTo(item);

        var user = $('<i class="fa fa-user"></i>').prependTo(label);
@@ -629,14 +625,15 @@ RED.keyboard = (function() {
        pane.find("#red-ui-settings-tab-keyboard-filter").searchBox({
            delay: 100,
            change: function() {
-                var filterValue = $(this).val().trim();
+                var filterValue = $(this).val().trim().toLowerCase();
                if (filterValue === "") {
                    shortcutList.editableList('filter', null);
                } else {
                    filterValue = filterValue.replace(/\s/g,"");
                    shortcutList.editableList('filter', function(data) {
-                        return data.id.toLowerCase().replace(/^.*:/,"").replace("-","").indexOf(filterValue) > -1;
-                    })
+                        var label = data.label.toLowerCase();
+                        return label.indexOf(filterValue) > -1;
+                    });
                }
            }
        });
@@ -657,9 +654,9 @@ RED.keyboard = (function() {
        });
        var shortcuts = RED.actions.list();
        shortcuts.sort(function(A,B) {
-            var Aid = A.id.replace(/^.*:/,"").replace(/[ -]/g,"").toLowerCase();
-            var Bid = B.id.replace(/^.*:/,"").replace(/[ -]/g,"").toLowerCase();
-            return Aid.localeCompare(Bid);
+            var Akey = A.label;
+            var Bkey = B.label;
+            return Akey.localeCompare(Bkey);
        });
        knownShortcuts = new Set();
        shortcuts.forEach(function(s) {
--- 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
@@ -363,106 +363,112 @@ RED.library = (function() {
                    options.onconfirm(item);
                }
            });
-        var itemTools = $("<div>").css({position: "absolute",bottom:"6px",right:"8px"});
-        var menuButton = $('<button class="red-ui-button red-ui-button-small" type="button"><i class="fa fa-ellipsis-h"></i></button>')
-            .on("click", function(evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                var elementPos = menuButton.offset();
-
-                var menuOptionMenu = RED.menu.init({id:"red-ui-library-browser-menu",
-                    options: [
-                        {id:"red-ui-library-browser-menu-addFolder",label:RED._("library.newFolder"), onselect: function() {
-                            var defaultFolderName = "new-folder";
-                            var defaultFolderNameMatches = {};
-
-                            var selected = dirList.treeList('selected');
-                            if (!selected.children) {
-                                selected = selected.parent;
-                            }
-                            var complete = function() {
-                                selected.children.forEach(function(c) {
-                                    if (/^new-folder/.test(c.label)) {
-                                        defaultFolderNameMatches[c.label] = true
-                                    }
-                                });
-                                var folderIndex = 2;
-                                while(defaultFolderNameMatches[defaultFolderName]) {
-                                    defaultFolderName = "new-folder-"+(folderIndex++)
-                                }
-
-                                selected.treeList.expand();
-                                var input = $('<input type="text" class="red-ui-treeList-input">').val(defaultFolderName);
-                                var newItem = {
-                                    icon: "fa fa-folder-o",
-                                    children:[],
-                                    path: selected.path,
-                                    element: input
-                                }
-                                var confirmAdd = function() {
-                                    var val = input.val().trim();
-                                    if (val === "") {
-                                        cancelAdd();
-                                        return;
-                                    } else {
-                                        for (var i=0;i<selected.children.length;i++) {
-                                            if (selected.children[i].label === val) {
-                                                cancelAdd();
-                                                return;
-                                            }
-                                        }
-                                    }
-                                    newItem.treeList.remove();
-                                    var finalItem = {
-                                        library: selected.library,
-                                        type: selected.type,
-                                        icon: "fa fa-folder",
-                                        children:[],
-                                        label: val,
-                                        path: newItem.path+val+"/"
-                                    }
-                                    selected.treeList.addChild(finalItem,true);
-                                }
-                                var cancelAdd = function() {
-                                    newItem.treeList.remove();
-                                }
-                                input.on('keydown', function(evt) {
-                                    evt.stopPropagation();
-                                    if (evt.keyCode === 13) {
-                                        confirmAdd();
-                                    } else if (evt.keyCode === 27) {
-                                        cancelAdd();
-                                    }
-                                })
-                                input.on("blur", function() {
-                                    confirmAdd();
-                                })
-                                selected.treeList.addChild(newItem);
-                                setTimeout(function() {
-                                    input.trigger("focus");
-                                    input.select();
-                                },400);
-                            }
-                            selected.treeList.expand(complete);
-
-                        } },
-                        // null,
-                        // {id:"red-ui-library-browser-menu-rename",label:"Rename", onselect: function() {} },
-                        // {id:"red-ui-library-browser-menu-delete",label:"Delete", onselect: function() {} }
-                    ]
-                }).on('mouseleave', function(){ $(this).remove(); dirList.focus() })
-                  .on('mouseup', function() { var self = $(this);self.hide(); dirList.focus(); setTimeout(function() { self.remove() },100)})
-                  .appendTo("body");
-                menuOptionMenu.css({
-                    position: "absolute",
-                    top: elementPos.top+"px",
-                    left: (elementPos.left - menuOptionMenu.width() + 20)+"px"
-                }).show();
-
-            }).appendTo(itemTools);
+        var itemTools = null;
        if (options.folderTools) {
            dirList.on('treelistselect', function(event, item) {
                if (item.writable !== false && item.treeList) {
+                    if (itemTools) {
+                        itemTools.remove();
+                    }
+                    itemTools = $("<div>").css({position: "absolute",bottom:"6px",right:"8px"});
+                    var menuButton = $('<button class="red-ui-button red-ui-button-small" type="button"><i class="fa fa-ellipsis-h"></i></button>')
+                        .on("click", function(evt) {
+                            evt.preventDefault();
+                            evt.stopPropagation();
+                            var elementPos = menuButton.offset();
+
+                            var menuOptionMenu
+                                = RED.menu.init({id:"red-ui-library-browser-menu",
+                                      options: [
+                                          {id:"red-ui-library-browser-menu-addFolder",label:RED._("library.newFolder"), onselect: function() {
+                                              var defaultFolderName = "new-folder";
+                                              var defaultFolderNameMatches = {};
+
+                                              var selected = dirList.treeList('selected');
+                                              if (!selected.children) {
+                                                  selected = selected.parent;
+                                              }
+                                              var complete = function() {
+                                                  selected.children.forEach(function(c) {
+                                                      if (/^new-folder/.test(c.label)) {
+                                                          defaultFolderNameMatches[c.label] = true
+                                                      }
+                                                  });
+                                                  var folderIndex = 2;
+                                                  while(defaultFolderNameMatches[defaultFolderName]) {
+                                                      defaultFolderName = "new-folder-"+(folderIndex++)
+                                                  }
+
+                                                  selected.treeList.expand();
+                                                  var input = $('<input type="text" class="red-ui-treeList-input">').val(defaultFolderName);
+                                                  var newItem = {
+                                                      icon: "fa fa-folder-o",
+                                                      children:[],
+                                                      path: selected.path,
+                                                      element: input
+                                                  }
+                                                  var confirmAdd = function() {
+                                                      var val = input.val().trim();
+                                                      if (val === "") {
+                                                          cancelAdd();
+                                                          return;
+                                                      } else {
+                                                          for (var i=0;i<selected.children.length;i++) {
+                                                              if (selected.children[i].label === val) {
+                                                                  cancelAdd();
+                                                                  return;
+                                                              }
+                                                          }
+                                                      }
+                                                      newItem.treeList.remove();
+                                                      var finalItem = {
+                                                          library: selected.library,
+                                                          type: selected.type,
+                                                          icon: "fa fa-folder",
+                                                          children:[],
+                                                          label: val,
+                                                          path: newItem.path+val+"/"
+                                                      }
+                                                      selected.treeList.addChild(finalItem,true);
+                                                  }
+                                                  var cancelAdd = function() {
+                                                      newItem.treeList.remove();
+                                                  }
+                                                  input.on('keydown', function(evt) {
+                                                      evt.stopPropagation();
+                                                      if (evt.keyCode === 13) {
+                                                          confirmAdd();
+                                                      } else if (evt.keyCode === 27) {
+                                                          cancelAdd();
+                                                      }
+                                                  })
+                                                  input.on("blur", function() {
+                                                      confirmAdd();
+                                                  })
+                                                  selected.treeList.addChild(newItem);
+                                                  setTimeout(function() {
+                                                      input.trigger("focus");
+                                                      input.select();
+                                                  },400);
+                                              }
+                                              selected.treeList.expand(complete);
+
+                                          } },
+                                          // null,
+                                          // {id:"red-ui-library-browser-menu-rename",label:"Rename", onselect: function() {} },
+                                          // {id:"red-ui-library-browser-menu-delete",label:"Delete", onselect: function() {} }
+                                      ]
+                                                }).on('mouseleave', function(){ $(this).remove(); dirList.focus() })
+                                .on('mouseup', function() { var self = $(this);self.hide(); dirList.focus(); setTimeout(function() { self.remove() },100)})
+                                .appendTo("body");
+                            menuOptionMenu.css({
+                                position: "absolute",
+                                top: elementPos.top+"px",
+                                left: (elementPos.left - menuOptionMenu.width() + 20)+"px"
+                            }).show();
+
+                        }).appendTo(itemTools);
+                    
                    itemTools.appendTo(item.treeList.label);
                }
            });
--- 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
@@ -208,7 +208,7 @@ RED.palette = (function() {
    }

    function escapeCategory(category) {
-        return category.replace(/[ /.]/g,"_");
+        return category.replace(/[\x00-\x2c\x2e-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]/g,"_");
    }
    function addNodeType(nt,def) {
        if (getPaletteNode(nt).length) {
--- 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
@@ -1212,6 +1212,9 @@ RED.projects = (function() {
                            }
                        }).appendTo(row);

+                        row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-open"></div>').hide().appendTo(container);
+                        $('<span style="display: flex; align-items: center;"><input style="padding:0; margin: 0 5px 0 0" checked type="checkbox" id="red-ui-projects-dialog-screen-clear-context"> <label for="red-ui-projects-dialog-screen-clear-context" style="padding:0; margin: 0"> <span data-i18n="projects.create.clearContext"></span></label></span>').appendTo(row).i18n();
+
                        row = $('<div class="form-row red-ui-projects-dialog-screen-create-row red-ui-projects-dialog-screen-create-row-empty red-ui-projects-dialog-screen-create-row-clone"></div>').appendTo(container);
                        $('<label for="red-ui-projects-dialog-screen-create-project-name">'+RED._("projects.create.project-name")+'</label>').appendTo(row);

@@ -1501,7 +1504,8 @@ RED.projects = (function() {
                                            };
                                        }
                                    } else if (projectType === 'open') {
-                                        return switchProject(selectedProject.name,function(err,data) {
+                                        var clearContext = $("#red-ui-projects-dialog-screen-clear-context").prop("checked")
+                                        return switchProject(selectedProject.name, clearContext, function(err,data) {
                                            if (err) {
                                                if (err.code !== 'credentials_load_failed') {
                                                    console.log(RED._("projects.create.unexpected_error"),err)
@@ -1595,7 +1599,7 @@ RED.projects = (function() {
        }
    }

-    function switchProject(name,done) {
+    function switchProject(name,clearContext,done) {
        RED.deploy.setDeployInflight(true);
        RED.projects.settings.switchProject(name);
        sendRequest({
@@ -1614,7 +1618,7 @@ RED.projects = (function() {
                    '*': done
                },
            }
-        },{active:true}).then(function() {
+        },{active:true, clearContext:clearContext}).then(function() {
            dialog.dialog( "close" );
            RED.events.emit("project:change", {name:name});
        }).always(function() {
@@ -1687,7 +1691,7 @@ RED.projects = (function() {
            dialogHeight = 590 - (750 - winHeight);
        }
        $(".red-ui-projects-dialog-box").height(dialogHeight);
-        $(".red-ui-projects-dialog-project-list-inner-container").height(Math.max(500,dialogHeight) - 180);
+        $(".red-ui-projects-dialog-project-list-inner-container").height(Math.max(500,dialogHeight) - 210);
        dialog.dialog('option','title',screen.title||"");
        dialog.dialog("open");
    }
--- 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
@@ -22,6 +22,7 @@ RED.search = (function() {
    var selected = -1;
    var visible = false;

+    var searchHistory = [];
    var index = {};
    var currentResults = [];
    var previousActiveElement;
@@ -52,10 +53,22 @@ RED.search = (function() {
        }
        l = l||n.label||n.name||n.id||"";

-
        var properties = ['id','type','name','label','info'];
-        if (n._def && n._def.defaults) {
-            properties = properties.concat(Object.keys(n._def.defaults));
+        const node_def = n && n._def;
+        if (node_def) {
+            if (node_def.defaults) {
+                properties = properties.concat(Object.keys(node_def.defaults));
+            }
+            if (n.type !== "group" && node_def.paletteLabel && node_def.paletteLabel !== node_def.type) {
+                try {
+                    const label = ("" + (typeof node_def.paletteLabel === "function" ? node_def.paletteLabel.call(node_def) : node_def.paletteLabel)).toLowerCase();
+                    if(label && label !== (""+node_def.type).toLowerCase()) {
+                        indexProperty(n, l, label);
+                    }
+                } catch(err) {
+                    console.warn(`error indexing ${l}`, err);
+                }
+            }
        }
        for (var i=0;i<properties.length;i++) {
            if (n.hasOwnProperty(properties[i])) {
@@ -105,6 +118,7 @@ RED.search = (function() {
        val = extractFlag(val,"unused",flags);
        val = extractFlag(val,"config",flags);
        val = extractFlag(val,"subflow",flags);
+        val = extractFlag(val,"hidden",flags);
        // uses:<node-id>
        val = extractValue(val,"uses",flags);

@@ -127,7 +141,7 @@ RED.search = (function() {
                var key = keys[i];
                var kpos = keys[i].indexOf(val);
                if (kpos > -1) {
-                    var ids = Object.keys(index[key]);
+                    var 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';
@@ -150,7 +164,15 @@ RED.search = (function() {
                                continue;
                            }
                        }
-
+                        if (flags.hasOwnProperty("hidden")) {
+                            // Only tabs can be hidden
+                            if (node.node.type !== 'tab') {
+                                continue
+                            }
+                            if (!RED.workspaces.isHidden(node.node.id)) {
+                                continue
+                            }
+                        }
                        if (flags.hasOwnProperty("unused")) {
                            var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
                                           (isConfigNode && node.node.users.length === 0)
@@ -196,6 +218,20 @@ RED.search = (function() {
        }
    }

+    function populateSearchHistory() {
+        if (searchHistory.length > 0) {
+            searchResults.editableList('addItem',{
+                historyHeader: true
+            });
+            searchHistory.forEach(function(entry) {
+                searchResults.editableList('addItem',{
+                    history: true,
+                    value: entry
+                });
+            })
+        }
+
+    }
    function createDialog() {
        dialog = $("<div>",{id:"red-ui-search",class:"red-ui-search"}).appendTo("#red-ui-main-container");
        var searchDiv = $("<div>",{class:"red-ui-search-container"}).appendTo(dialog);
@@ -204,9 +240,14 @@ RED.search = (function() {
            change: function() {
                searchResults.editableList('empty');
                selected = -1;
-                currentResults = search($(this).val());
+                var value = $(this).val();
+                if (value === "") {
+                    populateSearchHistory();
+                    return;
+                }
+                currentResults = search(value);
                if (currentResults.length > 0) {
-                    for (i=0;i<Math.min(currentResults.length,25);i++) {
+                    for (let i=0;i<Math.min(currentResults.length,25);i++) {
                        searchResults.editableList('addItem',currentResults[i])
                    }
                    if (currentResults.length > 25) {
@@ -276,7 +317,12 @@ RED.search = (function() {
                                })
                            }
                        }
-                    } else {
+                    } if ($(children[selected]).hasClass("red-ui-search-history")) {
+                        var object = $(children[selected]).find(".red-ui-editableList-item-content").data('data');
+                        if (object) {
+                            searchInput.searchBox('value',object.value)
+                        }
+                    } else if (!$(children[selected]).hasClass("red-ui-search-historyHeader")) {
                        if (currentResults.length > 0) {
                            reveal(currentResults[Math.max(0,selected)].node);
                        }
@@ -292,7 +338,32 @@ RED.search = (function() {
            addItem: function(container,i,object) {
                var node = object.node;
                var div;
-                if (object.more) {
+                if (object.historyHeader) {
+                    container.parent().addClass("red-ui-search-historyHeader")
+                    $('<div>',{class:"red-ui-search-empty"}).text(RED._("search.history")).appendTo(container);
+                    $('<button type="button" class="red-ui-button red-ui-button-small"></button>').text(RED._("search.clear")).appendTo(container).on("click", function(evt) {
+                        evt.preventDefault();
+                        searchHistory = [];
+                        searchResults.editableList('empty');
+                    });
+                } else if (object.history) {
+                    container.parent().addClass("red-ui-search-history")
+                    div = $('<a>',{href:'#',class:"red-ui-search-result"}).appendTo(container);
+                    div.text(object.value);
+                    div.on("click", function(evt) {
+                        evt.preventDefault();
+                        searchInput.searchBox('value',object.value)
+                        searchInput.focus();
+                    })
+                    $('<button type="button" class="red-ui-button red-ui-button-small"><i class="fa fa-remove"></i></button>').appendTo(container).on("click", function(evt) {
+                        evt.preventDefault();
+                        var index = searchHistory.indexOf(object.value);
+                        searchHistory.splice(index,1);
+                        searchResults.editableList('removeItem', object);
+                    });
+
+
+                } else if (object.more) {
                    container.parent().addClass("red-ui-search-more")
                    div = $('<a>',{href:'#',class:"red-ui-search-result red-ui-search-empty"}).appendTo(container);
                    div.text(RED._("palette.editor.more",{count:object.more.results.length-object.more.start}));
@@ -347,6 +418,12 @@ RED.search = (function() {
    }

    function reveal(node) {
+        var searchVal = searchInput.val();
+        var existingIndex = searchHistory.indexOf(searchVal);
+        if (existingIndex > -1) {
+            searchHistory.splice(existingIndex,1);
+        }
+        searchHistory.unshift(searchInput.val());
        hide();
        RED.view.reveal(node.id);
    }
@@ -365,9 +442,14 @@ RED.search = (function() {

            if (dialog === null) {
                createDialog();
+            } else {
+                searchResults.editableList('empty');
            }
            dialog.slideDown(300);
            searchInput.searchBox('value',v)
+            if (!v || v === "") {
+                populateSearchHistory();
+            }
            RED.events.emit("search:open");
            visible = true;
        }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js
@@ -19,6 +19,15 @@ RED.sidebar = (function() {
    var sidebar_tabs;
    var knownTabs = {};

+    // We store the current sidebar tab id in localStorage as 'last-sidebar-tab'
+    // This is restored when the editor is reloaded.
+    // We use sidebar_tabs.onchange to update localStorage. However that will
+    // also get triggered when the first tab gets added to the tabs - typically
+    // the 'info' tab. So we use the following variable to store the retrieved
+    // value from localStorage before we start adding the actual tabs
+    var lastSessionSelectedTab = null;
+
+
    function addTab(title,content,closeable,visible) {
        var options;
        if (typeof title === "string") {
@@ -194,16 +203,16 @@ RED.sidebar = (function() {
        RED.events.emit("sidebar:resize");
    }

-    function showSidebar(id) {
+    function showSidebar(id, skipShowSidebar) {
        if (id === ":first") {
-            id = RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
+            id = lastSessionSelectedTab || RED.settings.get("editor.sidebar.order",["info", "help", "version-control", "debug"])[0]
        }
        if (id) {
            if (!containsTab(id) && knownTabs[id]) {
                sidebar_tabs.addTab(knownTabs[id]);
            }
            sidebar_tabs.activateTab(id);
-            if (!RED.menu.isSelected("menu-item-sidebar")) {
+            if (!skipShowSidebar && !RED.menu.isSelected("menu-item-sidebar")) {
                RED.menu.setSelected("menu-item-sidebar",true);
            }
        }
@@ -227,6 +236,7 @@ RED.sidebar = (function() {
                if (tab.toolbar) {
                    $(tab.toolbar).show();
                }
+                RED.settings.setLocal("last-sidebar-tab", tab.id)
            },
            onremove: function(tab) {
                $(tab.wrapper).hide();
@@ -255,7 +265,9 @@ RED.sidebar = (function() {
            }
        });
        RED.popover.tooltip($("#red-ui-sidebar-separator").find(".red-ui-sidebar-control-right"),RED._("keyboard.toggleSidebar"),"core:toggle-sidebar");
-        showSidebar();
+
+        lastSessionSelectedTab = RED.settings.getLocal("last-sidebar-tab")
+
        RED.sidebar.info.init();
        RED.sidebar.help.init();
        RED.sidebar.config.init();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/state.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/state.js
@@ -27,5 +27,7 @@ RED.state = {
    PANNING: 10,
    SELECTING_NODE: 11,
    GROUP_DRAGGING: 12,
-    GROUP_RESIZE: 13
+    GROUP_RESIZE: 13,
+    DETACHED_DRAGGING: 14,
+    SLICING: 15
 }
--- 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
@@ -983,6 +983,17 @@ RED.subflow = (function() {
                        default: inputType
                    })
                    input.typedInput('value',val.value)
+                    if (inputType === 'cred') {
+                        if (node.credentials) {
+                            if (node.credentials[tenv.name]) {
+                                input.typedInput('value', node.credentials[tenv.name]);
+                            } else if (node.credentials['has_'+tenv.name]) {
+                                input.typedInput('value', "__PWRD__")
+                            } else {
+                                input.typedInput('value', "");
+                            }
+                        }
+                    }
                } else {
                    input.val(val.value)
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
@@ -346,7 +346,7 @@ RED.sidebar.config = (function() {
                refreshConfigNodeList();
            }
        });
-        RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'), RED._("sidebar.config.showAllUnusedConfigNodes"));
+        RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'), RED._("sidebar.config.showAllConfigNodes"));
        RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'), RED._("sidebar.config.showAllUnusedConfigNodes"));

    }
--- 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
@@ -64,15 +64,17 @@ RED.sidebar.help = (function() {
            style: "compact",
            delay: 100,
            change: function() {
-                var val = $(this).val().toLowerCase();
-                if (val) {
+                const searchFor = $(this).val().toLowerCase();
+                if (searchFor) {
                    showTOC();
-                    var c = treeList.treeList('filter',function(item) {
+                    treeList.treeList('filter',function(item) {
                        if (item.depth === 0) {
                            return true;
                        }
-                        return (item.nodeType &&  item.nodeType.indexOf(val) > -1) ||
-                               (item.subflowLabel && item.subflowLabel.indexOf(val) > -1)
+                        let found = item.nodeType && item.nodeType.toLowerCase().indexOf(searchFor) > -1;
+                        found = found || item.subflowLabel && item.subflowLabel.toLowerCase().indexOf(searchFor) > -1;
+                        found = found || item.palleteLabel && item.palleteLabel.toLowerCase().indexOf(searchFor) > -1;
+                        return found;
                    },true)
                } else {
                    treeList.treeList('filter',null);
@@ -224,17 +226,21 @@ RED.sidebar.help = (function() {


        moduleNames.forEach(function(moduleName) {
-            var module = modules[moduleName];
-            var nodeTypes = [];
-
-            var setNames = Object.keys(module.sets);
+            const module = modules[moduleName];
+            const nodeTypes = [];
+            const moduleSets = module.sets;
+            const setNames = Object.keys(moduleSets);
            setNames.forEach(function(setName) {
-                module.sets[setName].types.forEach(function(nodeType) {
+                const moduleSet = moduleSets[setName];
+                moduleSet.types.forEach(function(nodeType) {
                    if ($("script[data-help-name='"+nodeType+"']").length) {
+                        const n =  {_def:RED.nodes.getType(nodeType),type:nodeType}
+                        n.name = getNodePaletteLabel(n);
                        nodeTypes.push({
                            id: "node-type:"+nodeType,
                            nodeType: nodeType,
-                            element:getNodeLabel({_def:RED.nodes.getType(nodeType),type:nodeType})
+                            palleteLabel: n.name,
+                            element: getNodeLabel(n)
                        })
                    }
                })
@@ -254,18 +260,21 @@ RED.sidebar.help = (function() {
        treeList.treeList("data",helpData);
    }

-    function getNodeLabel(n) {
-        var div = $('<div>',{class:"red-ui-node-list-item"});
-        var icon = RED.utils.createNodeIcon(n).appendTo(div);
-        var label = n.name;
+    function getNodePaletteLabel(n) {
+        let label = n.name;
        if (!label && n._def && n._def.paletteLabel) {
            try {
                label = (typeof n._def.paletteLabel === "function" ? n._def.paletteLabel.call(n._def) : n._def.paletteLabel)||"";
            } catch (err) {
            }
        }
-        label = label || n.type;
-        $('<div>',{class:"red-ui-node-label"}).text(n.name||n.type).appendTo(icon);
+        return label || n.type;
+    }
+
+    function getNodeLabel(n) {
+        const div = $('<div>',{class:"red-ui-node-list-item"});
+        const icon = RED.utils.createNodeIcon(n).appendTo(div);
+        $('<div>',{class:"red-ui-node-label"}).text(getNodePaletteLabel(n)).appendTo(icon);
        return div;
    }

@@ -379,7 +388,7 @@ RED.sidebar.help = (function() {
                    var currentVersionParts = RED.settings.version.split(".");
                    var tourVersionParts = tour.version.split(".");
                    if (tourVersionParts[0] === currentVersionParts[0] && tourVersionParts[1] === currentVersionParts[1]) {
-                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">Take a tour</button></div>'
+                        tourHeader = '<div><button type="button" onclick="RED.actions.invoke(\'core:show-welcome-tour\')" class="red-ui-button">' + RED._("tourGuide.takeATour") + '</button></div>';
                    }
                }
                var aboutHeader = '<div style="text-align:center;">'+tourHeader+'</div>'
--- 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
@@ -175,6 +175,7 @@ RED.sidebar.info.outliner = (function() {
                                    n.d = true;
                                }
                                n.dirty = true;
+                                n.dirtyStatus = true;
                                n.changed = true;
                                RED.events.emit("nodes:change",n);
                                groupHistoryEvent.events.push(historyEvent);
@@ -203,6 +204,7 @@ RED.sidebar.info.outliner = (function() {
                        n.d = true;
                    }
                    n.dirty = true;
+                    n.dirtyStatus = true;
                    n.changed = true;
                    RED.events.emit("nodes:change",n);
                    RED.history.push(historyEvent);
@@ -272,6 +274,7 @@ RED.sidebar.info.outliner = (function() {
                {label:RED._("sidebar.info.search.invalidNodes"), value: "is:invalid"},
                {label:RED._("sidebar.info.search.uknownNodes"), value: "type:unknown"},
                {label:RED._("sidebar.info.search.unusedSubflows"), value:"is:subflow is:unused"},
+                {label:RED._("sidebar.info.search.hiddenFlows"), value:"is:hidden"},
            ]
        });

@@ -563,7 +566,7 @@ RED.sidebar.info.outliner = (function() {
        }
    }
    function getGutter(n) {
-        var span = $("<span>",{class:"red-ui-info-outline-gutter"});
+        var span = $("<span>",{class:"red-ui-info-outline-gutter red-ui-treeList-gutter-float"});
        var revealButton = $('<button type="button" class="red-ui-info-outline-item-control-reveal red-ui-button red-ui-button-small"><i class="fa fa-search"></i></button>').appendTo(span).on("click",function(evt) {
            evt.preventDefault();
            evt.stopPropagation();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js
@@ -256,6 +256,10 @@ RED.tourGuide = (function() {
            }
            $('<div>').css("text-align","left").html(getLocaleText(step.description)).appendTo(stepDescription);

+            if (step.image) {
+                $(`<img src="red/tours/${step.image}" />`).appendTo(stepDescription)
+            }
+
            var stepToolbar = $('<div>',{class:"red-ui-tourGuide-toolbar"}).appendTo(stepContent);

            // var breadcrumbs = $('<div>',{class:"red-ui-tourGuide-breadcrumbs"}).appendTo(stepToolbar);
@@ -348,7 +352,12 @@ RED.tourGuide = (function() {
                maxWidth: maxWidth+"px",
                direction: direction,
            })
-
+            setTimeout(function() {
+                var pos = popover.element.position()
+                if (pos.left < 0) {
+                    popover.element.css({left: 0});
+                }
+            },100);
            if (nextButton) {
                setTimeout(function() {
                    nextButton.focus();
@@ -359,6 +368,8 @@ RED.tourGuide = (function() {
            if (step.fallback) {
                focus.one("mouseenter", function(evt) {
                    setTimeout(function() {
+                        var pos = targetElement[0].getBoundingClientRect();
+                        var dimension = Math.max(50, Math.max(pos.width,pos.height)*1.5);
                        focus.css({
                            width: (4*dimension)+"px",
                            height: (4*dimension)+"px"
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js
@@ -121,6 +121,13 @@ RED.userSettings = (function() {
        //         {setting:"theme", label:"Theme",options:function(done){ done([{val:'',text:'default'}].concat(RED.settings.theme("themes"))) }},
        //     ]
        // },
+        {
+            title: "menu.label.view.view",
+            options: [
+                {setting:"view-store-zoom",label:"menu.label.view.storeZoom", default: false, toggle:true, onchange: function(val) { if (!val) { RED.settings.removeLocal("zoom-level")}}},
+                {setting:"view-store-position",label:"menu.label.view.storePosition", default: false, toggle:true, onchange: function(val) { if (!val) { RED.settings.removeLocal("scroll-positions")}}},
+            ]
+        },
        {
            title: "menu.label.view.grid",
            options: [
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -27,7 +27,7 @@ RED.utils = (function() {
        level: 'block',                                     // Is this a block-level or inline-level tokenizer?
        start(src) {
            if (!src) { return null; }
-            let m = src.match(/:[^:\n]/);
+            let m = src.match(/:[^:\n]/g);
            return m && m.index; // Hint to Marked.js to stop and check for a match
        },
        tokenizer(src, tokens) {
@@ -53,7 +53,7 @@ RED.utils = (function() {
        level: 'inline',           // Is this a block-level or inline-level tokenizer?
        start(src) {
            if (!src) { return null; }
-            let m = src.match(/:/);
+            let m = src.match(/:/g);
            return m && m.index;   // Hint to Marked.js to stop and check for a match
        },
        tokenizer(src, tokens) {
@@ -109,7 +109,7 @@ RED.utils = (function() {
    window._marked.use({extensions: [descriptionList, description] } );

    function renderMarkdown(txt) {
-        var rendered = _marked(txt);
+        var rendered = _marked.parse(txt);
        var cleaned = DOMPurify.sanitize(rendered, {SAFE_FOR_JQUERY: true})
        return cleaned;
    }
@@ -142,6 +142,8 @@ RED.utils = (function() {
                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta"></span>').text('function');
            } else if (value.hasOwnProperty('type') && (value.type === 'number' || value.type === 'bigint')) {
                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-number"></span>').text(value.data);
+            } else if (value.hasOwnProperty('type') && value.type === 'regexp') {
+                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-string"></span>').text(value.data);
            } else {
                result = $('<span class="red-ui-debug-msg-object-value red-ui-debug-msg-type-meta">object</span>');
            }
@@ -440,6 +442,8 @@ RED.utils = (function() {
            $('<span class="red-ui-debug-msg-type-null">undefined</span>').appendTo(entryObj);
        } else if (obj.__enc__ && (obj.type === 'number' || obj.type === 'bigint')) {
            e = $('<span class="red-ui-debug-msg-type-number red-ui-debug-msg-object-header"></span>').text(obj.data).appendTo(entryObj);
+        } else if (typeHint === "regexp" || (obj.__enc__ && obj.type === 'regexp')) {
+            e = $('<span class="red-ui-debug-msg-type-string red-ui-debug-msg-object-header"></span>').text((typeof obj === "string")?obj:obj.data).appendTo(entryObj);
        } else if (typeHint === "function" || (obj.__enc__ && obj.type === 'function')) {
            e = $('<span class="red-ui-debug-msg-type-meta red-ui-debug-msg-object-header"></span>').text("function").appendTo(entryObj);
        } else if (typeHint === "internal" || (obj.__enc__ && obj.type === 'internal')) {
--- 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
@@ -725,6 +725,90 @@ RED.view.tools = (function() {
        }
    }

+
+    function wireSeriesOfNodes() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var i = 0;
+                var newLinks = [];
+                while (i < selection.nodes.length - 1) {
+                    var nodeA = selection.nodes[i];
+                    var nodeB = selection.nodes[i+1];
+                    if (nodeA.outputs > 0 && nodeB.inputs > 0) {
+                        var existingLinks = RED.nodes.filterLinks({
+                            source: nodeA,
+                            target: nodeB,
+                            sourcePort: 0
+                        })
+                        if (existingLinks.length === 0) {
+                            var newLink = {
+                                source: nodeA,
+                                target: nodeB,
+                                sourcePort: 0
+                            }
+                            RED.nodes.addLink(newLink);
+                            newLinks.push(newLink);
+                        }
+                    }
+                    i++;
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
+    function wireNodeToMultiple() {
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var sourceNode = selection.nodes[0];
+                if (sourceNode.outputs === 0) {
+                    return;
+                }
+                var i = 1;
+                var newLinks = [];
+                while (i < selection.nodes.length) {
+                    var targetNode = selection.nodes[i];
+                    if (targetNode.inputs > 0) {
+                        var existingLinks = RED.nodes.filterLinks({
+                            source: sourceNode,
+                            target: targetNode,
+                            sourcePort: Math.min(sourceNode.outputs-1,i-1)
+                        })
+                        if (existingLinks.length === 0) {
+                            var newLink = {
+                                source: sourceNode,
+                                target: targetNode,
+                                sourcePort: Math.min(sourceNode.outputs-1,i-1)
+                            }
+                            RED.nodes.addLink(newLink);
+                            newLinks.push(newLink);
+                        }
+                    }
+                    i++;
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
    return {
        init: function() {
            RED.actions.add("core:show-selected-node-labels", function() { setSelectedNodeLabelState(true); })
@@ -783,7 +867,8 @@ RED.view.tools = (function() {
            RED.actions.add("core:distribute-selection-horizontally", function() { distributeSelection('h') })
            RED.actions.add("core:distribute-selection-vertically", function() { distributeSelection('v') })

-
+            RED.actions.add("core:wire-series-of-nodes", function() { wireSeriesOfNodes() })
+            RED.actions.add("core:wire-node-to-multiple", function() { wireNodeToMultiple() })

            // RED.actions.add("core:add-node", function() { addNode() })
        },
--- 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
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -66,7 +66,7 @@ RED.workspaces = (function() {
            var tabId = RED.nodes.id();
            do {
                workspaceIndex += 1;
-            } while ($("#red-ui-workspace-tabs a[title='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
+            } while ($("#red-ui-workspace-tabs li[flowname='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);

            ws = {
                type: "tab",
@@ -79,12 +79,15 @@ RED.workspaces = (function() {
            };
            RED.nodes.addWorkspace(ws,targetIndex);
            workspace_tabs.addTab(ws,targetIndex);
+
            workspace_tabs.activateTab(tabId);
            if (!skipHistoryEntry) {
                RED.history.push({t:'add',workspaces:[ws],dirty:RED.nodes.dirty()});
                RED.nodes.dirty(true);
            }
        }
+        $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
+
        RED.view.focus();
        return ws;
    }
@@ -208,65 +211,97 @@ RED.workspaces = (function() {
            },
            onhide: function(tab) {
                hideStack.push(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                hiddenTabs[tab.id] = true;
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
                RED.events.emit("workspace:hide",{workspace: tab.id})
            },
            onshow: function(tab) {
                removeFromHideStack(tab.id);
+
+                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
+                delete hiddenTabs[tab.id];
+                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
+
                RED.events.emit("workspace:show",{workspace: tab.id})
            },
            minimumActiveTabWidth: 150,
            scrollable: true,
            addButton: "core:add-flow",
            addButtonCaption: RED._("workspace.addFlow"),
-            menu: [
-                {
-                    id:"red-ui-tabs-menu-option-search-flows",
-                    label: RED._("workspace.listFlows"),
-                    onselect: "core:list-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-search-subflows",
-                    label: RED._("workspace.listSubflows"),
-                    onselect: "core:list-subflows"
-                },
-                null,
-                {
-                    id:"red-ui-tabs-menu-option-add-flow",
-                    label: RED._("workspace.addFlow"),
-                    onselect: "core:add-flow"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-flow-right",
-                    label: RED._("workspace.addFlowToRight"),
-                    onselect: "core:add-flow-to-right"
-                },
-                null,
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-flows",
-                    label: RED._("workspace.hideFlow"),
-                    onselect: "core:hide-flow"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-other-flows",
-                    label: RED._("workspace.hideOtherFlows"),
-                    onselect: "core:hide-other-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-show-all-flows",
-                    label: RED._("workspace.showAllFlows"),
-                    onselect: "core:show-all-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-hide-all-flows",
-                    label: RED._("workspace.hideAllFlows"),
-                    onselect: "core:hide-all-flows"
-                },
-                {
-                    id:"red-ui-tabs-menu-option-add-show-last-flow",
-                    label: RED._("workspace.showLastHiddenFlow"),
-                    onselect: "core:show-last-hidden-flow"
+            menu: function() {
+                var menuItems = [
+                    {
+                        id:"red-ui-tabs-menu-option-search-flows",
+                        label: RED._("workspace.listFlows"),
+                        onselect: "core:list-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-search-subflows",
+                        label: RED._("workspace.listSubflows"),
+                        onselect: "core:list-subflows"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow",
+                        label: RED._("workspace.addFlow"),
+                        onselect: "core:add-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-flow-right",
+                        label: RED._("workspace.addFlowToRight"),
+                        onselect: "core:add-flow-to-right"
+                    },
+                    null,
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-flows",
+                        label: RED._("workspace.hideFlow"),
+                        onselect: "core:hide-flow"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-other-flows",
+                        label: RED._("workspace.hideOtherFlows"),
+                        onselect: "core:hide-other-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-all-flows",
+                        label: RED._("workspace.showAllFlows"),
+                        onselect: "core:show-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-hide-all-flows",
+                        label: RED._("workspace.hideAllFlows"),
+                        onselect: "core:hide-all-flows"
+                    },
+                    {
+                        id:"red-ui-tabs-menu-option-add-show-last-flow",
+                        label: RED._("workspace.showLastHiddenFlow"),
+                        onselect: "core:show-last-hidden-flow"
+                    }
+                ]
+                let hiddenFlows = new Set()
+                for (let i = 0; i < hideStack.length; i++) {
+                    let ids = hideStack[i]
+                    if (!Array.isArray(ids)) {
+                        ids = [ids]
+                    }
+                    ids.forEach(id => {
+                        if (RED.nodes.workspace(id)) {
+                            hiddenFlows.add(id)
+                        }
+                    })
                }
-            ]
+                const flowCount = hiddenFlows.size;
+                if (flowCount > 0) {
+                    menuItems.unshift({
+                        label: RED._("workspace.hiddenFlows",{count: flowCount}),
+                        onselect: "core:list-hidden-flows"
+                    })
+                }
+                return menuItems;
+            }
        });
        workspaceTabCount = 0;
    }
@@ -406,7 +441,9 @@ RED.workspaces = (function() {
                }
            }
        })
-
+        RED.actions.add("core:list-hidden-flows",function() {
+            RED.actions.invoke("core:search","is:hidden ");
+        })
        RED.actions.add("core:list-flows",function() {
            RED.actions.invoke("core:search","type:tab ");
        })
@@ -450,7 +487,7 @@ RED.workspaces = (function() {
            var changes = { disabled: workspace.disabled };
            workspace.disabled = disabled;
            $("#red-ui-tab-"+(workspace.id.replace(".","-"))).toggleClass('red-ui-workspace-disabled',!!workspace.disabled);
-            if (id || activeWorkspace) {
+            if (!id || (id === activeWorkspace)) {
                $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled",!!workspace.disabled);
            }
            var historyEvent = {
@@ -531,11 +568,11 @@ RED.workspaces = (function() {
            }
            if (workspace_tabs.contains(id)) {
                workspace_tabs.hideTab(id);
-                var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-                hiddenTabs[id] = true;
-                RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
            }
        },
+        isHidden: function(id) {
+            return hideStack.includes(id)
+        },
        show: function(id,skipStack,unhideOnly) {
            if (!workspace_tabs.contains(id)) {
                var sf = RED.nodes.subflow(id);
@@ -558,14 +595,11 @@ RED.workspaces = (function() {
                }
                workspace_tabs.activateTab(id);
            }
-            var hiddenTabs = JSON.parse(RED.settings.getLocal("hiddenTabs")||"{}");
-            delete hiddenTabs[id];
-            RED.settings.setLocal("hiddenTabs",JSON.stringify(hiddenTabs));
        },
        refresh: function() {
            RED.nodes.eachWorkspace(function(ws) {
                workspace_tabs.renameTab(ws.id,ws.label);
-
+                $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
            })
            RED.nodes.eachSubflow(function(sf) {
                if (workspace_tabs.contains(sf.id)) {
--- a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
@@ -150,7 +150,8 @@ $popover-button-border-color-hover: #666;

 $diff-text-header-color: $secondary-text-color;
 $diff-text-header-background: #ffd;
-$diff-text-header-background-hover: #ffc;
+$diff-state-color: $primary-text-color;
+$diff-state-prefix-color: $secondary-text-color;
 $diff-state-added: #009900;
 $diff-state-deleted: #f80000;
 $diff-state-changed: #f89406;
@@ -193,10 +194,10 @@ $view-lasso-stroke: #ff7f0e;
 $view-lasso-fill: rgba(20,125,255,0.1);

 $view-background: $secondary-background;
-$view-select-mode-background: $secondary-background-selected;
 $view-grid-color: #eee;

 $node-label-color: #333;
+$node-port-label-color: #888;
 $node-border: #999;
 $node-border-unknown: #f33;
 $node-border-placeholder: #aaa;
@@ -211,6 +212,7 @@ $node-icon-background-color-opacity: 0.05;
 $node-icon-border-color: #000;
 $node-icon-border-color-opacity: 0.1;

+$node-config-background: #f3f3f3;

 $node-link-port-background: #eee;

--- a/packages/node_modules/@node-red/editor-client/src/sass/diff.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/diff.scss
@@ -562,7 +562,7 @@ ul.red-ui-deploy-dialog-confirm-list {
                width: 30px;
                display: inline-block;
                text-align: center;
-                color: $secondary-text-color;
+                color: $diff-state-prefix-color;
            }

            &.added {
@@ -577,9 +577,11 @@ ul.red-ui-deploy-dialog-confirm-list {
        }
        td.added {
            background: $diff-state-added-background;
+            color: $diff-state-color;
        }
        td.removed {
            background: $diff-state-deleted-background;
+            color: $diff-state-color;
        }
        tr.mergeHeader td {
            color: $diff-merge-header-color;
@@ -652,7 +654,7 @@ ul.red-ui-deploy-dialog-confirm-list {
            font-family: $monospace-font;
            padding: 5px 10px;
            text-align: left;
-            color: $secondary-text-color;
+            color: $diff-text-header-color;
            background: $diff-text-header-background;
            height: 30px;
            vertical-align: middle;
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -360,6 +360,7 @@ button.red-ui-button-small
    position: absolute;
    top: -3000px;
 }
+
 .form-row .red-ui-editor-node-label-form-row {
    margin: 5px 0 0 50px;
    label {
--- a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
@@ -21,6 +21,13 @@
    stroke-dasharray: 10 5;
 }

+.nr-ui-view-slice {
+    stroke-width: 1px;
+    stroke: $view-lasso-stroke;
+    fill: none;
+    stroke-dasharray: 10 5;
+}
+
 .node_label_italic, // deprecated: use red-ui-flow-node-label-italic
 .red-ui-flow-node-label-italic {
    font-style: italic;
@@ -47,7 +54,7 @@

 .red-ui-flow-port-label {
    stroke-width: 0;
-    fill: $secondary-text-color;
+    fill: $node-port-label-color;
    font-size: 16px;
    dominant-baseline: middle;
    text-anchor: middle;
--- a/packages/node_modules/@node-red/editor-client/src/sass/header.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/header.scss
@@ -187,7 +187,7 @@
    ul.red-ui-menu-dropdown {
        background: $header-menu-background;
        border: 1px solid $header-menu-background;
-        width: 250px !important;
+        width: 260px !important;
        margin-top: 0;
        li a {
            color: $header-menu-color;
--- a/packages/node_modules/@node-red/editor-client/src/sass/jquery.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/jquery.scss
@@ -26,6 +26,13 @@
    box-shadow: none;
 }

+.ui-widget.ui-widget-content {
+    border: 1px solid $tertiary-border-color;
+}
+.ui-widget-content {
+    border: 1px solid $secondary-border-color;
+}
+
 .ui-widget-header {
    color: $header-text-color;
 }
@@ -137,10 +144,10 @@
    padding: 0;
    border: 1px solid $form-input-border-color;
 }
-.ui-spinner input[type=text] {
+.ui-spinner input {
    background: $form-input-background;
    margin: 0 17px 0 0;
-    padding: 8px;
+    padding: 6px;
    border: none;
    border-top-right-radius: 0px;
    border-bottom-right-radius: 0px;
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette-editor.scss
@@ -254,7 +254,7 @@ button.red-ui-palette-editor-upload-button {
        padding: 2px 8px;
    }
    form {
-	width: 0;
+        width: 0;
    }
 }
 .red-ui-palette-editor-upload {
--- a/packages/node_modules/@node-red/editor-client/src/sass/search.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/search.scss
@@ -204,6 +204,28 @@
    font-style: italic;
    color: $form-placeholder-color;
 }
+.red-ui-search-history {
+    button {
+        display: none;
+        position: absolute;
+        top: 8px;
+        right: 7px;
+    }
+
+    &:hover button {
+        display: inline;
+    }
+}
+.red-ui-search-historyHeader {
+    button {
+        position: absolute;
+        top: 10px;
+        right: 7px;
+    }
+}
+.red-ui-search-history-result {
+
+}

 .red-ui-search-result-action {
    color: $primary-text-color;
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
@@ -54,7 +54,7 @@ ul.red-ui-sidebar-node-config-list {
    .red-ui-palette-icon-container {
        font-size: 12px;
        line-height: 30px;
-        background-color: $secondary-background-selected;
+        background-color: $node-icon-background-color;
        border-top-right-radius: 4px;
        border-bottom-right-radius: 4px;
        a {
@@ -63,10 +63,10 @@ ul.red-ui-sidebar-node-config-list {
            bottom: 0;
            left: 0;
            right: 0;
-            color: $secondary-text-color;
+            color: $node-port-label-color;
            &:hover {
                text-decoration: none;
-                background: $secondary-background-hover;
+                background: $node-port-background-hover;
            }
        }
    }
@@ -74,7 +74,7 @@ ul.red-ui-sidebar-node-config-list {
 .red-ui-palette-node-config {
    width: 160px;
    height: 30px;
-    background: $primary-background;
+    background: $node-config-background;
    color: $primary-text-color;
    cursor: pointer;
 }
--- a/packages/node_modules/@node-red/editor-client/src/sass/tabs.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tabs.scss
@@ -389,7 +389,19 @@ i.red-ui-tab-icon {
    vertical-align: top;

 }
-
+.red-ui-tab-hide {
+    .fa-eye-slash {
+        display: none;
+    }
+    &:hover {
+        .fa-eye-slash {
+            display: inline
+        }
+        .fa-eye {
+            display: none
+        }
+    }
+}
 .red-ui-tab-close {
    display: none;
    background: $tab-background-inactive;
--- a/packages/node_modules/@node-red/editor-client/src/sass/tourGuide.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tourGuide.scss
@@ -78,6 +78,12 @@
 }
 .red-ui-tourGuide-popover-description {
    padding: 10px 20px 5px;
+
+    img {
+        max-height: 150px;
+        border: 1px solid var(--red-ui-tourGuide-border);
+        border-radius: 2px;
+    }
 }
 .red-ui-tourGuide-popover-full {
    .red-ui-tourGuide-popover-description {
--- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss
@@ -16,7 +16,7 @@

 .red-ui-typedInput-container {
    border: 1px solid $form-input-border-color;
-    border-radius: 4px;
+    border-radius: 5px;
    height: 34px;
    line-height: 14px;
    display: inline-flex;
--- a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
@@ -58,7 +58,6 @@
 .red-ui-workspace-select-mode {
    .red-ui-workspace-chart-background {
        opacity: 0.7;
-        //        fill: $view-select-mode-background;
    }
    .red-ui-workspace-chart-grid line {
        opacity: 0.8;
--- a/packages/node_modules/@node-red/editor-client/src/tours/first-flow.js
+++ b/packages/node_modules/@node-red/editor-client/src/tours/first-flow.js
@@ -1,14 +1,23 @@
 export default {
    steps: [
        {
-            title: "Create your first flow",
+            title: {
+                'en-US': 'Create your first flow',
+                'ja': 'はじめてのフローを作成'
+            },
            width: 400,
-            description: 'This tutorial will guide you through creating your first flow',
+            description: {
+                'en-US': 'This tutorial will guide you through creating your first flow',
+                'ja': '本チュートリアルでは、はじめてのフローを作成する方法について説明します。'
+            },
            nextButton: 'start'
        },
        {
            element: "#red-ui-workspace .red-ui-tab-button.red-ui-tabs-add",
-            description: 'To add a new tab, click the <i class="fa fa-plus"></i> button',
+            description: {
+                'en-US': 'To add a new tab, click the <i class="fa fa-plus"></i> button',
+                'ja': '新しいタブを追加するため、 <i class="fa fa-plus"></i> ボタンをクリックします。'
+            },
            wait: {
                type: "dom-event",
                event: "click",
@@ -18,7 +27,10 @@ export default {
        {
            element: '.red-ui-palette-node[data-palette-type="inject"]',
            direction: 'right',
-            description: 'The palette lists all of the nodes available to use. Drag a new Inject node into the workspace.',
+            description: {
+                'en-US': 'The palette lists all of the nodes available to use. Drag a new Inject node into the workspace.',
+                'ja': 'パレットには、利用できる全てのノードが一覧表示されます。injectノードをワークスペースにドラッグします。'
+            },
            fallback: 'inset-bottom-right',
            wait: {
                type: "nr-event",
@@ -38,7 +50,10 @@ export default {
        {
            element: '.red-ui-palette-node[data-palette-type="debug"]',
            direction: 'right',
-            description: 'Next, drag a new Debug node into the workspace.',
+            description: {
+                'en-US': 'Next, drag a new Debug node into the workspace.',
+                'ja': '次に、debugノードをワークスペースにドラッグします。'
+            },
            fallback: 'inset-bottom-right',
            wait: {
                type: "nr-event",
@@ -57,7 +72,10 @@ export default {
        },
        {
            element: function() { return $("#"+this.injectNode.id+" .red-ui-flow-port") },
-            description: 'Add a wire from the output of the Inject node to the input of the Debug node',
+            description: {
+                'en-US': 'Add a wire from the output of the Inject node to the input of the Debug node',
+                'ja': 'injectノードの出力から、debugノードの入力へワイヤーで接続します。'
+            },
            fallback: 'inset-bottom-right',
            wait: {
                type: "nr-event",
@@ -69,7 +87,10 @@ export default {
        },
        {
            element: "#red-ui-header-button-deploy",
-            description: 'Deploy your changes so the flow is active in the runtime',
+            description: {
+                'en-US': 'Deploy your changes so the flow is active in the runtime',
+                'ja': 'フローをランタイムで実行させるため、変更をデプロイします。'
+            },
            width: 200,
            wait: {
                type: "dom-event",
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/delete-repair.gif
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/delete-repair.gif
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/detach-repair.gif
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/detach-repair.gif
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/slice.gif
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/slice.gif
--- a/packages/node_modules/@node-red/editor-client/src/tours/images/subflow-labels.png
+++ b/packages/node_modules/@node-red/editor-client/src/tours/images/subflow-labels.png
--- a/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
+++ b/packages/node_modules/@node-red/editor-client/src/tours/welcome.js
@@ -1,151 +1,156 @@
 export default {
-    version: "2.1.0",
+    version: "2.2.0",
    steps: [
        {
            titleIcon: "fa fa-map-o",
-            title: { "en-US": "Welcome to Node-RED 2.1!" },
-            description: { "en-US": "Let's take a moment to discover the new features in this release." }
-        },
-        {
-            title: { "en-US": "A new Tour Guide" },
-            description: { "en-US": "<p>First, as you've already found, we now have this tour of new features. We'll only show the tour the first time you open the editor for each new version of Node-RED.</p>"+
-                         "<p>You can choose not to see this tour in the future by disabling it under the View tab of User Settings.</p>" }
-        },
-        {
-            title: { "en-US": "New Edit menu" },
-            prepare() {
-                $("#red-ui-header-button-sidemenu").trigger("click");
-                $("#menu-item-edit-menu").parent().addClass("open")
+            title: {
+                "en-US": "Welcome to Node-RED 2.2!",
+                "ja": "Node-RED 2.2へようこそ!"
            },
-            complete() {
-                $("#menu-item-edit-menu").parent().removeClass("open")
-            },
-            element: "#menu-item-edit-menu-submenu",
-            interactive: false,
-            direction: "left",
-            description: { "en-US": "<p>The main menu has been updated with a new 'Edit' section. This includes all of the familar options, like cut/paste and undo/redo.</p>"+
-                         "<p>The menu now displays keyboard shortcuts for the options.</p>" }
-
-        },
-        {
-            title: { "en-US": "Arranging nodes" },
-            prepare() {
-                $("#red-ui-header-button-sidemenu").trigger("click");
-                $("#menu-item-arrange-menu").parent().addClass("open")
-            },
-            complete() {
-                $("#menu-item-arrange-menu").parent().removeClass("open")
-            },
-            element: "#menu-item-arrange-menu-submenu",
-            interactive: false,
-            direction: "left",
-            description: { "en-US": "<p>The new 'Arrange' section of the menu provides new options to help arrange your nodes. You can align them to a common edge, spread them out evenly or change their order.</p>" },
-        },
-        {
-            title: { "en-US": "Hiding tabs" },
-            element: "#red-ui-workspace-tabs > li.active",
-            description: { "en-US": '<p>Tabs can now be hidden by clicking their <i class="fa fa-times"></i> icon.</p><p>The Info Sidebar will still list all of your tabs, and tell you which ones are currently hidden.' },
-            interactive: false,
-            prepare() {
-                $("#red-ui-workspace-tabs > li.active .red-ui-tab-close").css("display","block");
-            },
-            complete() {
-                $("#red-ui-workspace-tabs > li.active .red-ui-tab-close").css("display","");
+            description: {
+                "en-US": "Let's take a moment to discover the new features in this release.",
+                "ja": "本リリースの新機能を見つけてみましょう。"
            }
        },
        {
-            title: { "en-US": "Tab menu" },
-            element: "#red-ui-workspace-tabs-menu",
-            description: { "en-US": '<p>The new tab menu also provides lots of new options for your tabs.</p>' },
-            interactive: false,
-            direction: "left",
-            prepare() {
-                $("#red-ui-workspace > .red-ui-tabs > .red-ui-tabs-menu a").trigger("click");
+            title: {
+                "en-US": "Search history",
+                "ja": "検索履歴"
+            },
+            description: {
+                "en-US": "<p>The Search dialog now keeps a history of your searches, making it easier to go back to a previous search.</p>",
+                "ja": "<p>検索ダイアログが検索履歴を保持するようになりました。これによって、過去の検索に戻りやすくなりました。</p>"
+            },
+            element: "#red-ui-search .red-ui-searchBox-form",
+            prepare(done) {
+                RED.search.show();
+                setTimeout(done,400);
            },
            complete() {
-                $(document).trigger("click");
-            }
-        },
-        {
-            title: { "en-US": "Flow and Group level environment variables" },
-            element: "#red-ui-workspace-tabs > li.active",
-            interactive: false,
-            description: { "en-US": "<p>Flows and Groups can now have their own environment variables that can be referenced by nodes inside them.</p>" },
-        },
-        {
-            prepare(done) {
-                RED.editor.editFlow(RED.nodes.workspace(RED.workspaces.active()),"editor-tab-envProperties");
-                setTimeout(done,700);
+                RED.search.hide();
            },
-            element: "#red-ui-tab-editor-tab-envProperties-link-button",
-            description: { "en-US": "<p>Their edit dialogs have a new Environment Variables section.</p>" },
        },
        {
-            element: ".node-input-env-container-row",
-            direction: "left",
-            description: { "en-US": '<p>The environment variables are listed in this table and new ones can be added by clicking the <i class="fa fa-plus"></i> button.</p>' },
-            complete(done) {
-                $("#node-dialog-cancel").trigger("click");
-                setTimeout(done,500);
-            }
-        },
-
-        {
-            title: {"en-US":"Link Call node added"},
-            prepare(done) {
-                this.paletteWasClosed = $("#red-ui-main-container").hasClass("red-ui-palette-closed");
-                RED.actions.invoke("core:toggle-palette",true)
-                $('[data-palette-type="link call"]')[0].scrollIntoView({block:"center"})
-                setTimeout(done,100);
+            title: {
+                "en-US": "Remembering Zoom & Position",
+                "ja": "拡大/縮小のレベルや位置を記憶"
            },
-            element: '[data-palette-type="link call"]',
-            direction: "right",
-            description: { "en-US": '<p>The <code>Link Call</code> node lets you call another flow that begins with a <code>Link In</code> node and get the result back when the message reaches a <code>Link Out</code> node.</p>' },
-        },
-        {
-            title: {"en-US":"MQTT nodes support dynamic connections"},
-            prepare(done) {
-                $('[data-palette-type="mqtt out"]')[0].scrollIntoView({block:"center"})
-                setTimeout(done,100);
+            description: {
+                "en-US": "<p>The editor has new options to restore the zoom level and scroll position when reloading the editor.</p>",
+                "ja": "<p>エディタを再読み込みした時に、拡大/縮小のレベルやスクロール位置を復元するための新しいオプションを利用できます。</p>"
            },
-            element: '[data-palette-type="mqtt out"]',
-            direction: "right",
-            description: { "en-US": '<p>The <code>MQTT</code> nodes now support creating their connections and subscriptions dynamically.</p>' },
-        },
-        {
-            title: {"en-US":"File nodes renamed"},
+            element: function() { return $("#user-settings-view-store-position").parent()},
            prepare(done) {
-                $('[data-palette-type="file"]')[0].scrollIntoView({block:"center"})
-                setTimeout(done,100);
-            },
-            complete() {
-                if (this.paletteWasClosed) {
-                    RED.actions.invoke("core:toggle-palette",false)
-                }
-            },
-            element: '[data-palette-type="file"]',
-            direction: "right",
-            description: { "en-US": '<p>The file nodes have been renamed to make it clearer which node does what.</p>' },
-        },
-        {
-            title: {"en-US":"Deep copy option on Change node"},
-            prepare(done) {
-                var def = RED.nodes.getType('change')
-                RED.editor.edit({id:"test",type:"change",rules:[{t:'set',p:'payload',pt:'msg', tot:'msg',to:"anotherProperty"}],_def:def, _:def._})
-                setTimeout(done,700);
+                RED.actions.invoke("core:show-user-settings")
+                setTimeout(done,400);
            },
            complete(done) {
-                $("#node-dialog-cancel").trigger("click");
-                setTimeout(done,500);
+                $("#node-dialog-ok").trigger("click");
+                setTimeout(done,400);
            },
-            element: function() {
-                return $(".node-input-rule-property-deepCopy").next()
-            },
-            description: { "en-US": '<p>The Set rule has a new option to create a deep copy of the value. This ensures a complete copy is made, rather than using a reference.</p>' },
        },
        {
-            title: { "en-US": "And that's not all..." },
-            description: { "en-US": "<p>There are many more smaller changes, including:</p><ul><li>Auto-complete suggestions in the <code>msg</code> TypedInput.</li><li>Support for <code>msg.resetTimeout</code> in the <code>Join</code> node.</li><li>Pushing messages to the front of the queue in the <code>Delay</code> node's rate limiting mode.</li><li>An optional second output on the <code>Delay</code> node for rate limited messages.</li></ul>" }
+            title: {
+                "en-US": "New wiring actions",
+                "ja": "新しいワイヤー操作"
+            },
+            // image: "images/",
+            description: {
+                "en-US": `<p>A pair of new actions have been added to help with wiring nodes together:</p>
+                          <ul>
+                          <li><b><code>Wire Series Of Nodes</code></b> - adds a wire (if necessary) between each pair of nodes in the order they were selected.</li>
+                          <li><b><code>Wire Node To Multiple</code></b> - wires the first node selected to all of the other selected nodes.</li>
+                          </ul>
+                          <p>Actions can be accessed from the Action List in the main menu.</p>`,
+                "ja": `<p>ノード接続を支援する2つの新しい操作が追加されました:</p>
+                       <ul>
+                       <li><b><code>Wire Series Of Nodes</code></b> - ノードを選択した順序で、各ノードのペアの間にワイヤーを(必要に応じて)追加します。</li>
+                       <li><b><code>Wire Node To Multiple</code></b> - 最初に選択したノードから、他の選択した全てのノードに対して、ワイヤーを追加します。</li>
+                       </ul>
+                       <p>メインメニュー内の動作一覧から、これらの操作を利用できます。</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Deleting nodes and reconnecting wires",
+                "ja": "ノードの削除とワイヤーの再接続"
+            },
+            image: "images/delete-repair.gif",
+            description: {
+                "en-US": `<p>It is now possible to delete a selection of nodes and automatically repair the wiring behind them.</p>
+                          <p>This is really useful if you want to remove a node from the middle of the flow.</p>
+                          <p>Hold the Ctrl (or Cmd) key when you press Delete and the nodes will be gone and the wires repaired.</p>
+                          `,
+                "ja": `<p>選択したノードを削除した後、その背後にあるワイヤーを自動的に修復できるようになりました。</p>
+                       <p>これは、フローの中からノードを削除する時に、とても便利に使えます。</p>
+                       <p>Ctrl (またはCmd)キーを押しながらDeleteキーを押すと、ノードがなくなり、ワイヤーが修復されます。</p>
+                       `
+            }
+        },
+        {
+            title: {
+                "en-US": "Detaching nodes from a flow",
+                "ja": "フローからノードの切り離し"
+            },
+            image: "images/detach-repair.gif",
+            description: {
+                "en-US": `<p>If you want to remove a node from a flow without deleting it,
+                          you can use the <b><code>Detach Selected Nodes</code></b> action.</p>
+                          <p>The nodes will be removed from their flow, the wiring repaired behind them, and then attached to the mouse
+                          so you can drop them wherever you want in the workspace.</p>
+                          <p>There isn't a default keyboard shortcut assigned for this new action, but
+                          you can add your own via the Keyboard pane of the main Settings dialog.</p>`,
+                "ja": `<p>ノードを削除することなく、フローからノードを除きたい場合は、<b><code>Detach Selected Nodes</code></b>操作を利用できます。</p>
+                       <p>フローからノードが除かれた後、背後のワイヤーが修復され、ノードはマウスポインタにつながります。そのため、ワークスペースの好きな所にノードを配置できます。</p>
+                       <p>この新しい操作に対して、デフォルトのキーボードショートカットは登録されていませんが、メイン設定ダイアログのキーボード設定から追加できます。</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "More wiring tricks",
+                "ja": "その他のワイヤー操作"
+            },
+            image: "images/slice.gif",
+            description: {
+                "en-US": `<p>A couple more wiring tricks to share.</p>
+                          <p>You can now select multiple wires by holding the Ctrl (or Cmd) key
+                          when clicking on a wire. This makes it easier to delete multiple wires in one go.</p>
+                          <p>If you hold the Ctrl (or Cmd) key, then click and drag with the right-hand mouse button,
+                          you can slice through wires to remove them.</p>`,
+                "ja": `<p>その他のいくつかのワイヤー操作</p>
+                       <p>Ctrl (またはCmd)キーを押しながらワイヤーをクリックすることで、複数のワイヤーを選択できるようになりました。これによって、複数のワイヤーを一度に削除することが簡単になりました。</p>
+                       <p>Ctrl (またはCmd)キーを押しながら、マウスの右ボタンを用いてドラッグすると、ワイヤーを切って削除できます。</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "Subflow Output Labels",
+                "ja": "サブフローの出力ラベル"
+            },
+            image: "images/subflow-labels.png",
+            description: {
+                "en-US": "<p>If a subflow has labels set for its outputs, they now get shown on the ports within the subflow template view.</p>",
+                "ja": "<p>サブフローの出力にラベルが設定されている場合、サブフローテンプレート画面内のポートにラベルが表示されるようになりました。</p>"
+            },
+        },
+        {
+            title: {
+                "en-US": "Node Updates",
+                "ja": "ノードの更新"
+            },
+            // image: "images/",
+            description: {
+                "en-US": `<ul>
+                            <li>The JSON node will now handle parsing Buffer payloads</li>
+                            <li>The TCP Client nodes support TLS connections</li>
+                            <li>The WebSocket node allows you to specify a sub-protocol when connecting</li>
+                          </ul>`,
+                "ja": `<ul>
+                         <li>JSONノードが、バッファ形式のペイロードを解析できるようになりました。</li>
+                         <li>TCPクライアントノードが、TLS接続をサポートしました。</li>
+                         <li>WebSocketノードで、接続時にサブプロトコルを指定できるようになりました。</li>
+                       </ul>`
+            }
        }
    ]
 }
--- 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
@@ -31,12 +31,12 @@ interface NodeStatus {
 }

 declare class node {
-    /** 
-    * Send 1 or more messages asynchronously 
-    * @param {object | object[]} msg  The msg object 
-    * @param {Boolean} [clone=true]  Flag to indicate the `msg` should be cloned. Default = `true`   
-    * @see node-red documentation [writing-functions: sending messages asynchronously](https://nodered.org/docs/user-guide/writing-functions#sending-messages-asynchronously) 
-    */ 
+    /**
+    * Send 1 or more messages asynchronously
+    * @param {object | object[]} msg  The msg object
+    * @param {Boolean} [clone=true]  Flag to indicate the `msg` should be cloned. Default = `true`
+    * @see node-red documentation [writing-functions: sending messages asynchronously](https://nodered.org/docs/user-guide/writing-functions#sending-messages-asynchronously)
+    */
    static send(msg:object|object[], clone?:Boolean): void;
    /** Inform runtime this instance has completed its operation */
    static done();
@@ -57,11 +57,13 @@ declare class node {
    */
    static status(status:string|boolean|number);
    /** the id of this node */
-    public readonly id:string;
+    public static readonly id:string;
    /** the name of this node */
-    public readonly name:string;
+    public static readonly name:string;
+    /** the path identifier for this node */
+    public static readonly path:string;
    /** the number of outputs of this node */
-    public readonly outputCount:number;
+    public static readonly outputCount:number;
 }
 declare class context {
    /**
@@ -93,27 +95,27 @@ declare class context {
    /**
     * Set one or multiple values in context (synchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     */
    static set(name: string | string[], value?: any | any[]);
    /**
     * Set one or multiple values in context (asynchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param callback - (optional) Callback function (`(err) => {}`)
     */
    static set(name: string | string[], value?: any | any[], callback?: Function);
    /**
     * Set one or multiple values in context (synchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param store - (optional) Name of context store
     */
    static set(name: string | string[], value?: any | any[], store?: string);
    /**
     * Set one or multiple values in context (asynchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param store - (optional) Name of context store
     * @param callback - (optional) Callback function (`(err) => {}`)
     */
@@ -158,27 +160,27 @@ declare class flow {
    /**
     * Set one or multiple values in context (synchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     */
    static set(name: string | string[], value?: any | any[]);
    /**
     * Set one or multiple values in context (asynchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param callback - (optional) Callback function (`(err) => {}`)
     */
    static set(name: string | string[], value?: any | any[], callback?: Function);
    /**
     * Set one or multiple values in context (synchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param store - (optional) Name of context store
     */
    static set(name: string | string[], value?: any | any[], store?: string);
    /**
     * Set one or multiple values in context (asynchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param store - (optional) Name of context store
     * @param callback - (optional) Callback function (`(err) => {}`)
     */
@@ -225,32 +227,32 @@ declare class global {
    /**
     * Set one or multiple values in context (synchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     */
    static set(name: string | string[], value?: any | any[]);
    /**
     * Set one or multiple values in context (asynchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param callback - (optional) Callback function (`(err) => {}`)
     */
    static set(name: string | string[], value?: any | any[], callback?: Function);
    /**
     * Set one or multiple values in context (synchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param store - (optional) Name of context store
     */
    static set(name: string | string[], value?: any | any[], store?: string);
    /**
     * Set one or multiple values in context (asynchronous).
     * @param name - Name (or array of names) to set in context
-     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed. 
+     * @param value - The value (or array of values) to store in context. If the value(s) are null/undefined, the context item(s) will be removed.
     * @param store - (optional) Name of context store
     * @param callback - (optional) Callback function (`(err) => {}`)
     */
    static set(name: string | string[], value?: any | any[], store?: string, callback?: Function);
- 
+
    /** Get an array of the keys in the context store */
    static keys(): Array<string>;
    /** Get an array of the keys in the context store */
@@ -261,6 +263,20 @@ declare class global {
    static keys(store: string, callback: Function);
 }
 declare class env {
-    /** Get an environment variable value */
-    static get(name:string);
+    /** 
+     * Get an environment variable value  
+     * 
+     * Predefined node-red variables...  
+     *   * `NR_NODE_ID` - the ID of the node
+     *   * `NR_NODE_NAME` - the Name of the node
+     *   * `NR_NODE_PATH` - the Path of the node
+     *   * `NR_GROUP_ID` - the ID of the containing group
+     *   * `NR_GROUP_NAME` - the Name of the containing group
+     *   * `NR_FLOW_ID` - the ID of the flow the node is on
+     *   * `NR_FLOW_NAME` - the Name of the flow the node is on
+     * @param name Name of the environment variable to get
+     * @example 
+     * ```const flowName = env.get("NR_FLOW_NAME");```
+     */
+    static get(name:string) :string;
 }
--- a/packages/node_modules/@node-red/editor-client/templates/index.mst
+++ b/packages/node_modules/@node-red/editor-client/templates/index.mst
@@ -7,7 +7,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
 <!--
-  Copyright JS Foundation and other contributors, http://js.foundation
+  Copyright OpenJS Foundation and other contributors, https://openjsf.org/

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -24,24 +24,24 @@
 <title>{{ page.title }}</title>
 <link rel="icon" type="image/png" href="{{ page.favicon }}">
 <link rel="mask-icon" href="{{ page.tabicon.icon }}" color="{{ page.tabicon.colour }}">
-<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css">
-<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
-<link rel="stylesheet" href="red/style.min.css">
+<link rel="stylesheet" href="vendor/jquery/css/base/jquery-ui.min.css?v={{ page.version }}">
+<link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css?v={{ page.version }}">
+<link rel="stylesheet" href="red/style.min.css?v={{ page.version }}">
 {{#page.css}}
 <link rel="stylesheet" href="{{.}}">
 {{/page.css}}
 {{#asset.vendorMonaco}}
-<link rel="stylesheet" href="vendor/monaco/style.css">
+<link rel="stylesheet" href="vendor/monaco/style.css?v={{ page.version }}">
 {{/asset.vendorMonaco}}
 </head>
 <body spellcheck="false">
 <div id="red-ui-editor"></div>
-<script src="vendor/vendor.js"></script>
+<script src="vendor/vendor.js?v={{ page.version }}"></script>
 {{#asset.vendorMonaco}}
-<script src="{{ asset.vendorMonaco }}"></script>
+<script src="{{ asset.vendorMonaco }}?v={{ page.version }}"></script>
 {{/asset.vendorMonaco}}
-<script src="{{ asset.red }}"></script>
-<script src="{{ asset.main }}"></script>
+<script src="{{ asset.red }}?v={{ page.version }}"></script>
+<script src="{{ asset.main }}?v={{ page.version }}"></script>
 {{# page.scripts }}
 <script src="{{.}}"></script>
 {{/ page.scripts }}
--- a/packages/node_modules/@node-red/nodes/LICENSE
+++ b/packages/node_modules/@node-red/nodes/LICENSE
@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/

                                 Apache License
                           Version 2.0, January 2004
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -234,7 +234,7 @@
                            }
                        } else if (v[i].vt === "jsonata") {
                            try{jsonata(v[i].v);}catch(e){return false;}
-                        } else if ([i].vt === "json") {
+                        } else if (v[i].vt === "json") {
                            try{JSON.parse(v[i].v);}catch(e){return false;}
                        }
                    }
@@ -353,14 +353,16 @@
        },
        oneditprepare: function() {
            var node = this;
+            var payloadType = node.payloadType;
+
            if (node.payloadType == null) {
                if (node.payload == "") {
-                    node.payloadType = "date";
+                    payloadType = "date";
                } else {
-                    node.payloadType = "str";
+                    payloadType = "str";
                }
            } else if (node.payloadType === 'string' || node.payloadType === 'none') {
-                node.payloadType = "str";
+                payloadType = "str";
            }

            $("#inject-time-type-select").on("change", function() {
@@ -539,7 +541,7 @@
                    var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
                        .css("width","calc(70% - 30px)")
                        .appendTo(row)
-                        .typedInput({default:prop.vt,types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
+                        .typedInput({default:prop.vt || 'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});

                    propertyName.typedInput('value',prop.p);
                    propertyValue.typedInput('value',prop.v);
@@ -557,12 +559,12 @@
                var payload = {
                    p:'payload',
                    v: node.payload ? node.payload : '',
-                    vt:node.payloadType ? node.payloadType : 'date'
+                    vt:payloadType ? payloadType : 'date'
                };
                var topic = {
                    p:'topic',
                    v: node.topic ? node.topic : '',
-                    vt:'string'
+                    vt:'str'
                }
                node.props = [payload,topic];
            }
@@ -573,11 +575,16 @@
                if (newProp.v === undefined) {
                    if (prop.p === 'payload') {
                        newProp.v = node.payload ? node.payload : '';
-                        newProp.vt = node.payloadType ? node.payloadType : 'date';
+                        newProp.vt = payloadType ? payloadType : 'date';
                    } else if (prop.p === 'topic' && prop.vt === "str") {
                        newProp.v =  node.topic ? node.topic : '';
                    }
                }
+                if (newProp.vt === "string") {
+                    // Fix bug in pre 2.1 where an old Inject node might have
+                    // a migrated rule with type 'string' not 'str'
+                    newProp.vt = "str";
+                }
                eList.editableList('addItem',newProp);
            }

@@ -683,9 +690,9 @@
            this.topic = "";
            var result = getProps(items, true);
            this.props = result.props;
-            if(result.payloadType) { this.payloadType = result.payloadType; };
-            if(result.payload) { this.payload = result.payload; };
-            if(result.topic) { this.topic = result.topic; };
+            if(result.hasOwnProperty('payloadType')) { this.payloadType = result.payloadType; };
+            if(result.hasOwnProperty('payload')) { this.payload = result.payload; };
+            if(result.hasOwnProperty('topic')) { this.topic = result.topic; };
        },
        button: {
            enabled: function() {
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.js
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
@@ -75,16 +75,12 @@ module.exports = function(RED) {
        node.repeaterSetup = function () {
            if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
                this.repeat = this.repeat * 1000;
-                if (RED.settings.verbose) {
-                    this.log(RED._("inject.repeat", this));
-                }
+                this.debug(RED._("inject.repeat", this));
                this.interval_id = setInterval(function() {
                    node.emit("input", {});
                }, this.repeat);
            } else if (this.crontab) {
-                if (RED.settings.verbose) {
-                    this.log(RED._("inject.crontab", this));
-                }
+                this.debug(RED._("inject.crontab", this));
                this.cronjob = scheduleTask(this.crontab,() => { node.emit("input", {})});
            }
        };
@@ -113,9 +109,10 @@ module.exports = function(RED) {
                if (!property) return;

                if (valueType === "jsonata") {
-                    if (p.exp) {
+                    if (p.v) {
                        try {
-                            var val = RED.util.evaluateJSONataExpression(p.exp, msg);
+                            var exp = RED.util.prepareJSONataExpression(p.v, node);
+                            var val = RED.util.evaluateJSONataExpression(exp, msg);
                            RED.util.setMessageProperty(msg, property, val, true);
                        }
                        catch  (err) {
@@ -148,10 +145,8 @@ module.exports = function(RED) {
        }
        if (this.interval_id != null) {
            clearInterval(this.interval_id);
-            if (RED.settings.verbose) { this.log(RED._("inject.stopped")); }
        } else if (this.cronjob != null) {
            this.cronjob.stop();
-            if (RED.settings.verbose) { this.log(RED._("inject.stopped")); }
            delete this.cronjob;
        }
    };
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.js
@@ -7,6 +7,7 @@ module.exports = function(RED) {
    var debuglength = RED.settings.debugMaxLength || 1000;
    var useColors = RED.settings.debugUseColors || false;
    util.inspect.styles.boolean = "red";
+    const { hasOwnProperty } = Object.prototype;

    function DebugNode(n) {
        var hasEditExpression = (n.targetType === "jsonata");
@@ -107,7 +108,9 @@ module.exports = function(RED) {
            }
        })
        this.on("input", function(msg, send, done) {
-            if (msg.hasOwnProperty("status") && msg.status.hasOwnProperty("source") && msg.status.source.hasOwnProperty("id") && (msg.status.source.id === node.id)) {
+            if (hasOwnProperty.call(msg, "status") && msg.status &&
+                hasOwnProperty.call(msg.status, "source") && msg.status.source &&
+                hasOwnProperty.call(msg.status.source, "id") && (msg.status.source.id === node.id)) {
                done();
                return;
            }
@@ -118,17 +121,18 @@ module.exports = function(RED) {
                    var st = (typeof output === 'string') ? output : util.inspect(output);
                    var fill = "grey";
                    var shape = "dot";
-                    if (typeof output === 'object' && output.hasOwnProperty("fill") && output.hasOwnProperty("shape") && output.hasOwnProperty("text")) {
+                    if (typeof output === 'object' && hasOwnProperty.call(output, "fill") && hasOwnProperty.call(output, "shape") && hasOwnProperty.call(output, "text")) {
                        fill = output.fill;
                        shape = output.shape;
                        st = output.text;
                    }
                    if (node.statusType === "auto") {
-                        if (msg.hasOwnProperty("error")) {
+                        if (hasOwnProperty.call(msg, "error")) {
                            fill = "red";
                            st = msg.error.message;
                        }
-                        if (msg.hasOwnProperty("status")) {
+                        if (hasOwnProperty.call(msg, "status") &&
+                           msg.status) {
                            fill = msg.status.fill || "grey";
                            shape = msg.status.shape || "ring";
                            st = msg.status.text || "";
@@ -194,7 +198,7 @@ module.exports = function(RED) {

    function sendDebug(msg) {
        // don't put blank errors in sidebar (but do add to logs)
-        //if ((msg.msg === "") && (msg.hasOwnProperty("level")) && (msg.level === 20)) { return; }
+        //if ((msg.msg === "") && (hasOwnProperty.call(msg, "level")) && (msg.level === 20)) { return; }
        msg = RED.util.encodeObject(msg,{maxLength:debuglength});
        RED.comms.publish("debug",msg);
    }
@@ -280,6 +284,18 @@ module.exports = function(RED) {
            root: path.join(__dirname,"lib","debug"),
            dotfiles: 'deny'
        };
-        res.sendFile(req.params[0], options);
+        try {
+            res.sendFile(
+                req.params[0],
+                options,
+                 err => {
+                    if (err) {
+                        res.sendStatus(404);
+                    }
+                }
+            )
+        } catch(err) {
+            res.sendStatus(404);
+        }
    });
 };
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -91,21 +91,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: 5;"><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 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: 5;"><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 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: 5;"><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 id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
            </div>
        </div>

@@ -399,7 +399,7 @@
                    $("#func-tabs-content").children().hide();
                    $("#" + tab.id).show();
                    let editor = $("#" + tab.id).find('.monaco-editor').first();
-                   	if(editor.length) {
+                        if(editor.length) {
                        if(that.editor.nodered && that.editor.type == "monaco") {
                            that.editor.nodered.refreshModuleLibs(getLibsList());
                        }
@@ -512,6 +512,7 @@
                return function(e) {
                    e.preventDefault();
                    var value = editor.getValue();
+                    var extraLibs = that.libs || [];
                    RED.editor.editJavaScript({
                        value: value,
                        width: "Infinity",
@@ -523,7 +524,8 @@
                            setTimeout(function() {
                                editor.focus();
                            },300);
-                        }
+                        },
+                        extraLibs: extraLibs
                    })
                }
            }
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js
@@ -112,6 +112,7 @@ module.exports = function(RED) {
                "var node = {"+
                    "id:__node__.id,"+
                    "name:__node__.name,"+
+                    "path:__node__.path,"+
                    "outputCount:__node__.outputCount,"+
                    "log:__node__.log,"+
                    "error:__node__.error,"+
@@ -163,6 +164,7 @@ module.exports = function(RED) {
            __node__: {
                id: node.id,
                name: node.name,
+                path: node._path,
                outputCount: node.outputs,
                log: function() {
                    node.log.apply(node, arguments);
@@ -234,8 +236,7 @@ module.exports = function(RED) {
            },
            env: {
                get: function(envVar) {
-                    var flow = node._flow;
-                    return flow.getSetting(envVar);
+                    return RED.util.getSetting(node, envVar);
                }
            },
            setTimeout: function () {
@@ -345,6 +346,7 @@ module.exports = function(RED) {
                        var node = {
                            id:__node__.id,
                            name:__node__.name,
+                            path:__node__.path,
                            outputCount:__node__.outputCount,
                            log:__node__.log,
                            error:__node__.error,
@@ -367,6 +369,7 @@ module.exports = function(RED) {
                        var node = {
                            id:__node__.id,
                            name:__node__.name,
+                            path:__node__.path,
                            outputCount:__node__.outputCount,
                            log:__node__.log,
                            error:__node__.error,
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.js
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.js
@@ -168,9 +168,9 @@ module.exports = function(RED) {
                        return getFromValueType(RED.util.getMessageProperty(msg,rule.from),done);
                    } else if (rule.fromt === 'flow' || rule.fromt === 'global') {
                        var contextKey = RED.util.parseContextStore(rule.from);
-                        if (/\[msg\./.test(context.key)) {
+                        if (/\[msg\./.test(contextKey.key)) {
                            // The key has a nest msg. reference to evaluate first
-                            context.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
+                            contextKey.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
                        }
                        node.context()[rule.fromt].get(contextKey.key, contextKey.store, (err,fromValue) => {
                            if (err) {
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.html
@@ -114,7 +114,8 @@
            timeout: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
            timeoutUnits: {value:"seconds"},
            rate: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
-            nbRateUnits: {value:"1", required:false, validate:RED.validators.regex(/\d+|/)},
+            nbRateUnits: {value:"1", required:false,
+                          validate:function(v) { return v === undefined || (RED.validators.number(v) && (v >= 0)); }},
            rateUnits: {value: "second"},
            randomFirst: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
            randomLast: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
@@ -275,18 +275,22 @@ module.exports = function(RED) {
                    if (msg.hasOwnProperty("flush")) {
                        var len = node.buffer.length;
                        if (typeof(msg.flush) == 'number') { len = Math.min(Math.floor(msg.flush),len); }
-                        while (len > 0) {
-                            const msgInfo = node.buffer.shift();
-                            if (Object.keys(msgInfo.msg).length > 1) {
-                                node.send(msgInfo.msg);
-                                msgInfo.done();
-                            }
-                            len = len - 1;
-                        }
-                        if (node.buffer.length === 0) {
+                        if (len === 0) {
                            clearInterval(node.intervalID);
                            node.intervalID = -1;
                        }
+                        else {
+                            while (len > 0) {
+                                const msgInfo = node.buffer.shift();
+                                if (Object.keys(msgInfo.msg).length > 1) {
+                                    node.send(msgInfo.msg);
+                                    msgInfo.done();
+                                }
+                                len = len - 1;
+                            }
+                            clearInterval(node.intervalID);
+                            node.intervalID = setInterval(sendMsgFromBuffer, node.rate);
+                        }
                        node.status({fill:"blue",shape:"dot",text:node.buffer.length});
                        done();
                    }
@@ -372,6 +376,7 @@ module.exports = function(RED) {
                hit = false;
                for (var b in node.buffer) { // check if already in queue
                    if (msg.topic === node.buffer[b].msg.topic) {
+                        if (node.outputs === 2) { send([null,node.buffer[b].msg]) }
                        node.buffer[b].done();
                        node.buffer[b] = {msg, send, done}; // if so - replace existing entry
                        hit = true;
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
@@ -86,7 +86,7 @@ module.exports = function(RED) {
                    });
                    var cmd = arg.shift();
                    /* istanbul ignore else  */
-                    if (RED.settings.verbose) { node.log(cmd+" ["+arg+"]"); }
+                    node.debug(cmd+" ["+arg+"]");
                    child = spawn(cmd,arg,node.spawnOpt);
                    node.status({fill:"blue",shape:"dot",text:"pid:"+child.pid});
                    var unknownCommand = (child.pid === undefined);
@@ -136,7 +136,7 @@ module.exports = function(RED) {
                }
                else {
                    /* istanbul ignore else  */
-                    if (RED.settings.verbose) { node.log(arg); }
+                    node.debug(arg);
                    child = exec(arg, node.execOpt, function (error, stdout, stderr) {
                        var msg2, msg3;
                        delete msg.payload;
@@ -155,7 +155,7 @@ module.exports = function(RED) {
                            if (error.signal) { msg3.payload.signal = error.signal; }
                            if (error.code === null) { node.status({fill:"red",shape:"dot",text:"killed"}); }
                            else { node.status({fill:"red",shape:"dot",text:"error:"+error.code}); }
-                            if (RED.settings.verbose) { node.log('error:' + error); }
+                            node.debug('error:' + error);
                        }
                        else if (node.oldrc === "false") {
                            msg3 = RED.util.cloneMessage(msg);
--- a/packages/node_modules/@node-red/nodes/core/function/rbe.js
+++ b/packages/node_modules/@node-red/nodes/core/function/rbe.js
@@ -58,7 +58,7 @@ module.exports = function(RED) {
                else {
                    var n = parseFloat(value);
                    if (!isNaN(n)) {
-                        if ((typeof node.previous[t] === 'undefined') && (this.func === "narrowband")) {
+                        if ((typeof node.previous[t] === 'undefined') && (this.func === "narrowband" || this.func === "narrowbandEq")) {
                            if (node.start === '') { node.previous[t] = n; }
                            else { node.previous[t] = node.start; }
                        }
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.html
@@ -442,7 +442,17 @@
        }
        return defaultContentType || 'none'
    }
-
+    /**
+     * Test a topic string is valid for publishing
+     * @param {string} topic
+     * @returns `true` if it is a valid topic
+     */
+    function validateMQTTPublishTopic(topic, opts) {
+        if(!topic || topic == "" || !/[\+#\b\f\n\r\t\v\0]/.test(topic)) {
+            return true;
+        }
+        return RED._("node-red:mqtt.errors.invalid-topic");
+    }
    RED.nodes.registerType('mqtt-broker',{
        category: 'config',
        defaults: {
@@ -480,6 +490,7 @@
            willRetain: {value:false},
            willPayload: {value:""},
            willMsg: { value: {}},
+            userProps: { value: ""},
            sessionExpiry: {value:0}
        },
        credentials: {
@@ -609,6 +620,7 @@
                default:  !this.userProps ? 'none':'json',
                types: [typedInputNoneOpt, 'json']
            });
+            $("#node-config-input-userProps").typedInput('value',this.userProps);
            if (typeof this.keepalive === 'undefined') {
                this.keepalive = 15;
                $("#node-config-input-keepalive").val(this.keepalive);
@@ -718,6 +730,14 @@
            }

            if (v5) {
+                this.userProps = "";
+                const userPropsType = $("#node-config-input-userProps").typedInput("type");
+                if(userPropsType == "json") {
+                    const userProps = $("#node-config-input-userProps").val();
+                    if (userProps && typeof userProps === "string") {
+                        this.userProps = userProps.trim();
+                    }
+                }
                this.birthMsg = saveV5Message("birth");
                this.closeMsg = saveV5Message("close");
                this.willMsg = saveV5Message("will");
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -68,12 +68,21 @@ module.exports = function(RED) {
    }

    /**
-     * Test a topic string is valid
+     * Test a topic string is valid for subscription
     * @param {string} topic
     * @returns `true` if it is a valid topic
     */
    function isValidSubscriptionTopic(topic) {
-        return /^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/.test(topic)
+        return /^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/.test(topic);
+    }
+
+    /**
+     * Test a topic string is valid for publishing
+     * @param {string} topic
+     * @returns `true` if it is a valid topic
+     */
+    function isValidPublishTopic(topic) {
+        return !/[\+#\b\f\n\r\t\v\0]/.test(topic);
    }

    /**
@@ -103,7 +112,7 @@ module.exports = function(RED) {
            if(src[propName] === "true" || src[propName] === true) {
                dst[propName] = true;
            } else if(src[propName] === "false" || src[propName] === false) {
-                dst[propName] = true;
+                dst[propName] = false;
            }
        } else {
            if(def != undefined) dst[propName] = def;
@@ -288,7 +297,7 @@ module.exports = function(RED) {
                        //TODO: delete msg.responseTopic - to prevent it being resent?
                    }
                }
-                topicOK = topicOK && !/[\+#]/.test(msg.topic);
+                topicOK = topicOK && isValidPublishTopic(msg.topic);

                if (topicOK) {
                    node.brokerConn.publish(msg, done); // send the message
@@ -391,6 +400,7 @@ module.exports = function(RED) {
        node.options = {};
        node.queue = [];
        node.subscriptions = {};
+        node.clientListeners = []
        /** @type {mqtt.MqttClient}*/ this.client;
        node.setOptions = function(opts, init) {
            if(!opts || typeof opts !== "object") {
@@ -415,8 +425,12 @@ module.exports = function(RED) {
            setIfHasProperty(opts, node, "topicAliasMaximum", init);
            setIfHasProperty(opts, node, "maximumPacketSize", init);
            setIfHasProperty(opts, node, "receiveMaximum", init);
-            setIfHasProperty(opts, node, "userProperties", init);//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
-            setIfHasProperty(opts, node, "userPropertiesType", init);
+            //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
+            if (hasProperty(opts, "userProperties")) {
+                node.userProperties = opts.userProperties;
+            } else if (hasProperty(opts, "userProps")) {
+                node.userProperties = opts.userProps;
+            }

            function createLWT(topic, payload, qos, retain, v5opts, v5SubPropName) {
                let message = undefined;
@@ -465,7 +479,7 @@ module.exports = function(RED) {
                };
                if(hasProperty(opts, "willTopic")) {
                    //will v5 properties must be set in the "properties" sub object
-                    node.options.will = createLWT(opts.willTopic, opts.willPayload, opts.willQos, opts.willRetain, opts.willMsg, "properies");
+                    node.options.will = createLWT(opts.willTopic, opts.willPayload, opts.willQos, opts.willRetain, opts.willMsg, "properties");
                };
            } else {
                //update options
@@ -525,7 +539,7 @@ module.exports = function(RED) {
                    // Only for ws or wss, check if proxy env var for additional configuration
                    if (node.brokerurl.indexOf("wss://") > -1 || node.brokerurl.indexOf("ws://") > -1) {
                        // check if proxy is set in env
-                        let prox, noprox;
+                        let prox, noprox, noproxy;
                        if (process.env.http_proxy) { prox = process.env.http_proxy; }
                        if (process.env.HTTP_PROXY) { prox = process.env.HTTP_PROXY; }
                        if (process.env.no_proxy) { noprox = process.env.no_proxy.split(","); }
@@ -637,24 +651,8 @@ module.exports = function(RED) {

        node.deregister = function(mqttNode,done) {
            delete node.users[mqttNode.id];
-            if (node.closing) {
-                return done();
-            }
-            if (Object.keys(node.users).length === 0) {
-                if (node.client && node.client.connected) {
-                    // Send close message
-                    if (node.closeMessage) {
-                        node.publish(node.closeMessage,function(err) {
-                            node.client.end(done);
-                        });
-                    } else {
-                        node.client.end(done);
-                    }
-                    return;
-                } else {
-                    if (node.client) { node.client.end(); }
-                    return done();
-                }
+            if (!node.closing && node.connected && Object.keys(node.users).length === 0) {
+                node.disconnect();
            }
            done();
        };
@@ -663,15 +661,22 @@ module.exports = function(RED) {
        }
        node.connect = function (callback) {
            if (node.canConnect()) {
+                node.closing = false;
                node.connecting = true;
                setStatusConnecting(node, true);
                try {
                    node.serverProperties = {};
+                    if(node.client) {
+                        //belt and braces to avoid left over clients
+                        node.client.end(true);
+                        node._clientRemoveListeners();
+                    }
                    node.client = mqtt.connect(node.brokerurl, node.options);
                    node.client.setMaxListeners(0);
-                    let callbackDone = false; //prevent re-connects causing node.client.on('connect' firing callback multiple times
+                    let callbackDone = false; //prevent re-connects causing node._clientOn('connect' firing callback multiple times
                    // Register successful connect or reconnect handler
-                    node.client.on('connect', function (connack) {
+                    node._clientOn('connect', function (connack) {
+                        node.closing = false;
                        node.connecting = false;
                        node.connected = true;
                        if(!callbackDone && typeof callback == "function") {
@@ -702,7 +707,7 @@ module.exports = function(RED) {
                        }
                        setStatusConnected(node, true);
                        // Remove any existing listeners before resubscribing to avoid duplicates in the event of a re-connection
-                        node.client.removeAllListeners('message');
+                        node._clientRemoveListeners('message');

                        // Re-subscribe to stored topics
                        for (var s in node.subscriptions) {
@@ -714,7 +719,7 @@ module.exports = function(RED) {
                                    if (node.subscriptions[s].hasOwnProperty(r)) {
                                        qos = Math.max(qos,node.subscriptions[s][r].qos);
                                        _options = node.subscriptions[s][r].options;
-                                        node.client.on('message',node.subscriptions[s][r].handler);
+                                        node._clientOn('message',node.subscriptions[s][r].handler);
                                    }
                                }
                                _options.qos = _options.qos || qos;
@@ -727,18 +732,25 @@ module.exports = function(RED) {
                            node.publish(node.birthMessage);
                        }
                    });
-                    node.client.on("reconnect", function() {
+                    node._clientOn("reconnect", function() {
                        setStatusConnecting(node, true);
                    });
-                    //TODO: what to do with this event? Anything? Necessary?
-                    node.client.on("disconnect", function(packet) {
+                    //Broker Disconnect - V5 event
+                    node._clientOn("disconnect", function(packet) {
                        //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
-                        var rc = packet && packet.properties && packet.properties.reasonString;
-                        var rc = packet && packet.properties && packet.reasonCode;
-                        //TODO: If keeping this event, do we use these? log these?
+                        const rc = (packet && packet.properties && packet.reasonCode) || packet.reasonCode;
+                        const rs = packet && packet.properties && packet.properties.reasonString || "";
+                        const details = {
+                            broker: (node.clientid?node.clientid+"@":"")+node.brokerurl,
+                            reasonCode: rc,
+                            reasonString: rs
+                        }
+                        node.connected = false;
+                        node.log(RED._("mqtt.state.broker-disconnected", details));
+                        setStatusDisconnected(node, true);
                    });
                    // Register disconnect handlers
-                    node.client.on('close', function () {
+                    node._clientOn('close', function () {
                        if (node.connected) {
                            node.connected = false;
                            node.log(RED._("mqtt.state.disconnected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
@@ -750,33 +762,59 @@ module.exports = function(RED) {

                    // Register connect error handler
                    // The client's own reconnect logic will take care of errors
-                    node.client.on('error', function (error) {
+                    node._clientOn('error', function (error) {
                    });
                }catch(err) {
                    console.log(err);
                }
            }
        };
+
        node.disconnect = function (callback) {
            const _callback = function () {
-                setStatusDisconnected(node, true);
+                if(node.connected || node.connecting) {
+                    setStatusDisconnected(node, true);
+                }
+                if(node.client) { node._clientRemoveListeners(); }
                node.connecting = false;
                node.connected = false;
                callback && typeof callback == "function" && callback();
            };
+            if(!node.client) { return _callback(); }
+            if(node.closing) { return _callback(); }

-            if(node.client) {
-                if(node.client.connected && node.closeMessage) {
-                    node.publish(node.closeMessage, function (err) {
-                        node.client.end(_callback);
-                    });
-                } else if(node.client.connected || node.client.reconnecting) {
-                    node.client.end(_callback);
-                } else if(node.client.disconnecting || node.client.connected === false) {
-                    _callback();
-                }
+            let waitEnd = (client, ms) => {
+                return new Promise( (resolve, reject) => {
+                    node.closing = true;
+                    if(!client) { 
+                        resolve();
+                     } else {
+                        const t = setTimeout(() => {
+                            //clean end() has exceeded WAIT_END, lets force end!
+                            client && client.end(true);
+                            reject();
+                        }, ms);
+                        client.end(() => {
+                             clearTimeout(t);
+                             resolve()
+                         });
+                     }
+                });
+            };
+            if(node.connected && node.closeMessage) {
+                node.publish(node.closeMessage, function (err) {
+                    waitEnd(node.client, 2000).then(() => {
+                        _callback();
+                    }).catch((e) => {
+                        _callback();
+                    })
+                });
            } else {
-                _callback();
+                waitEnd(node.client, 2000).then(() => {
+                    _callback();
+                }).catch((e) => {
+                    _callback();
+                })
            }
        }
        node.subscriptionIds = {};
@@ -813,7 +851,7 @@ module.exports = function(RED) {
            };
            node.subscriptions[topic][ref] = sub;
            if (node.connected) {
-                node.client.on('message',sub.handler);
+                node._clientOn('message',sub.handler);
                node.client.subscribe(topic, options);
            }
        };
@@ -824,7 +862,7 @@ module.exports = function(RED) {
            if (sub) {
                if (sub[ref]) {
                    if(node.client) {
-                        node.client.removeListener('message',sub[ref].handler);
+                        node._clientRemoveListeners('message',sub[ref].handler);
                    }
                    delete sub[ref];
                }
@@ -858,8 +896,18 @@ module.exports = function(RED) {
                    qos: msg.qos || 0,
                    retain: msg.retain || false
                };
+                let topicOK = hasProperty(msg, "topic") && (typeof msg.topic === "string") && (isValidPublishTopic(msg.topic));
                //https://github.com/mqttjs/MQTT.js/blob/master/README.md#mqttclientpublishtopic-message-options-callback
                if(node.options.protocolVersion == 5) {
+                    const bsp = node.serverProperties || {};
+                    if (msg.userProperties && typeof msg.userProperties !== "object") {
+                        delete msg.userProperties;
+                    }
+                    if (hasProperty(msg, "topicAlias") && !isNaN(Number(msg.topicAlias))) {
+                        msg.topicAlias = parseInt(msg.topicAlias);
+                    } else {
+                        delete msg.topicAlias;
+                    }
                    options.properties = options.properties || {};
                    setStrProp(msg, options.properties, "responseTopic");
                    setBufferProp(msg, options.properties, "correlationData");
@@ -869,31 +917,75 @@ module.exports = function(RED) {
                    setIntProp(msg, options.properties, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
                    setBoolProp(msg, options.properties, "payloadFormatIndicator");
                    //FUTURE setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
-                    if (options.properties.topicAlias) {
-                        if (!node.topicAliases.hasOwnProperty(options.properties.topicAlias) && msg.topic == "") {
+
+                    //check & sanitise topic
+                    if (topicOK && options.properties.topicAlias) {
+                        let aliasValid = (bsp.topicAliasMaximum && bsp.topicAliasMaximum >= options.properties.topicAlias);
+                        if (!aliasValid) {
                            done("Invalid topicAlias");
                            return
                        }
                        if (node.topicAliases[options.properties.topicAlias] === msg.topic) {
-                            msg.topic = ""
+                            msg.topic = "";
                        } else {
-                            node.topicAliases[options.properties.topicAlias] = msg.topic
+                            node.topicAliases[options.properties.topicAlias] = msg.topic;
                        }
+                    } else if (!msg.topic && options.properties.responseTopic) {
+                        msg.topic = msg.responseTopic;
+                        topicOK = isValidPublishTopic(msg.topic);
+                        delete msg.responseTopic; //prevent responseTopic being resent?
                    }
                }

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

        node.on('close', function(done) {
-            node.closing = true;
-            node.disconnect(done);
+            node.disconnect(function() {
+                done();
+            });
        });

+        /**
+         * 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.  
+         * 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
+         */
+         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`}.  
+         * * 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
+         * @param {string} [event] The name of the event (optional)
+         * @param {function} [handler] The handler for this event (optional)
+         */
+         node._clientRemoveListeners = function(event, handler) {
+            node.clientListeners = node.clientListeners.filter((l) => {
+                if (event && event !== l.event) { return true; }
+                if (handler && handler !== l.handler) { return true; }
+                node.client.removeListener(l.event, l.handler)
+                return false; //found and removed, filter out this one
+            })
+        }
+
    }

    RED.nodes.registerType("mqtt-broker",MQTTBrokerNode,{
@@ -1040,7 +1132,7 @@ module.exports = function(RED) {

                            //subscribe to sub.topic & hook up subscriptionHandler
                            node.brokerConn.subscribe(sub.topic, options, function (topic, payload, packet) {
-                                subscriptionHandler(node, sub.datatype, topic, payload, packet);
+                                subscriptionHandler(node, sub.datatype || node.datatype, topic, payload, packet);
                            }, node.id);
                            node.dynamicSubs[sub.topic] = sub; //save for later unsubscription & 'list' action
                        })
@@ -1068,6 +1160,9 @@ module.exports = function(RED) {
                        node.brokerConn.unsubscribe(node.topic,node.id, removed);
                    }
                    node.brokerConn.deregister(node, done);
+                    node.brokerConn = null;
+                } else {
+                    done();
                }
            });
        } else {
@@ -1128,7 +1223,12 @@ module.exports = function(RED) {
            }
            node.brokerConn.register(node);
            node.on('close', function(done) {
-                node.brokerConn.deregister(node,done);
+                if (node.brokerConn) {
+                    node.brokerConn.deregister(node,done);
+                    node.brokerConn = null;
+                } else {
+                    done();
+                }
            });
        } else {
            node.error(RED._("mqtt.errors.missing-config"));
--- 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>
@@ -120,6 +125,7 @@
            tls: {type:"tls-config",required: false},
            persist: {value:false},
            proxy: {type:"http proxy",required: false},
+            insecureHTTPParser: {value: false},
            authType: {value: ""},
            senderr: {value: false}
        },
@@ -224,6 +230,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();
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -214,6 +214,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                delete options.headers[h];
                            }
                        })
+
+                        if (node.insecureHTTPParser) {
+                            options.insecureHTTPParser = true
+                        }
                    }
                ],
                beforeRedirect: [
@@ -264,7 +268,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
            if (opts.headers.hasOwnProperty('cookie')) {
                var cookies = cookie.parse(opts.headers.cookie, {decode:String});
                for (var name in cookies) {
-                    opts.cookieJar.setCookie(cookie.serialize(name, cookies[name], {encode:String}), url, {ignoreError: true});
+                    opts.cookieJar.setCookieSync(cookie.serialize(name, cookies[name], {encode:String}), url, {ignoreError: true});
                }
                delete opts.headers.cookie;
            }
@@ -277,13 +281,13 @@ in your Node-RED user directory (${RED.settings.userDir}).
                        } else if (typeof msg.cookies[name] === 'object') {
                            if(msg.cookies[name].encode === false){
                                // If the encode option is false, the value is not encoded.
-                                opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url, {ignoreError: true});
+                                opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name].value, {encode: String}), url, {ignoreError: true});
                            } else {
                                // The value is encoded by encodeURIComponent().
-                                opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name].value), url, {ignoreError: true});
+                                opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name].value), url, {ignoreError: true});
                            }
                        } else {
-                            opts.cookieJar.setCookie(cookie.serialize(name, msg.cookies[name]), url, {ignoreError: true});
+                            opts.cookieJar.setCookieSync(cookie.serialize(name, msg.cookies[name]), url, {ignoreError: true});
                        }
                    }
                }
@@ -298,18 +302,16 @@ in your Node-RED user directory (${RED.settings.userDir}).
            }
            if (Object.keys(this.credentials).length != 0) {
                if (this.authType === "basic") {
-                    // Workaround for https://github.com/sindresorhus/got/issues/1169
-                    var cred = ""
-                    if (this.credentials.user) {
-                        // opts.username = this.credentials.user;
-                        cred = this.credentials.user
-                    }
-                    if (this.credentials.password) {
-                        // opts.password = this.credentials.password;
-                        cred += ":" + this.credentials.password
+                    // Workaround for https://github.com/sindresorhus/got/issues/1169 (fixed in got v12)
+                    // var cred = ""
+                    if (this.credentials.user || this.credentials.password) {
+                        // cred = `${this.credentials.user}:${this.credentials.password}`;
+                        if (this.credentials.user === undefined) { this.credentials.user = ""}
+                        if (this.credentials.password === undefined) { this.credentials.password = ""}
+                        opts.headers.Authorization = "Basic " + Buffer.from(`${this.credentials.user}:${this.credentials.password}`).toString("base64");
                    }
                    // build own basic auth header
-                    opts.headers.Authorization = "Basic " + Buffer.from(cred).toString("base64");
+                    // opts.headers.Authorization = "Basic " + Buffer.from(cred).toString("base64");
                } else if (this.authType === "digest") {
                    let digestCreds = this.credentials;
                    let sentCreds = false;
--- a/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/core/network/22-websocket.html
@@ -177,7 +177,8 @@
            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/)},
            tls: {type:"tls-config",required: false},
            wholemsg: {value:"false"},
-            hb: {value: "", validate: RED.validators.number(/*blank allowed*/true) }
+            hb: {value: "", validate: RED.validators.number(/*blank allowed*/true) },
+            subprotocol: {value:"",required: false}
        },
        inputs:0,
        outputs:0,
@@ -265,7 +266,10 @@
        <label for="node-config-input-tls" data-i18n="httpin.tls-config"></label>
        <input type="text" id="node-config-input-tls">
    </div>
-
+    <div class="form-row">
+        <label for="node-config-input-subprotocol"><i class="fa fa-tag"></i> <span data-i18n="websocket.label.subprotocol"></span></label>
+        <input type="text" id="node-config-input-subprotocol">
+    </div>
    <div class="form-row">
        <label for="node-config-input-wholemsg" data-i18n="websocket.sendrec"></label>
        <select type="text" id="node-config-input-wholemsg" style="width: 70%;">
--- a/Show More
+++ b/Show More