diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a278b223..b7239546c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,6 @@
 name: PublishDockerImage
-
+env:
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 on:
   release:
     types: [published]
@@ -27,9 +28,6 @@ jobs:
         with:
             node-version: '12'
       - run: node ./node-red/.github/scripts/update-node-red-docker.js
-        with:
-          env:
-              ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       - name: Create Docker Pull Request
         uses: peter-evans/create-pull-request@v2
         with:
diff --git a/.travis.yml b/.travis.yml
index 315eb07a8..4cd0dffe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,5 +11,11 @@ matrix:
       before_script:
         - npm install -g coveralls
     - node_js: "12"
+      script:
+        - ./node_modules/.bin/grunt no-coverage
     - node_js: "10"
+      script:
+        - ./node_modules/.bin/grunt no-coverage
     - node_js: "8"
+      script:
+        - ./node_modules/.bin/grunt no-coverage
diff --git a/API.md b/API.md
index f349ea8fe..692a34723 100644
--- a/API.md
+++ b/API.md
@@ -10,6 +10,6 @@ Module | Description
 [@node-red/editor-api](@node-red_editor-api.html) | an Express application that serves the Node-RED editor and provides the Admin HTTP API
 [@node-red/runtime](@node-red_runtime.html) | the core runtime of Node-RED
 [@node-red/util](@node-red_util.html) | common utilities for the Node-RED runtime and editor modules
-@node-red/registry | the internal node registry
+[@node-red/registry](@node-red_registry.html) | the internal node registry
 @node-red/nodes | the default set of core nodes
 @node-red/editor-client | the client-side resources of the Node-RED editor application
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9d7ba010..7af2084c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,65 @@
+### 1.2.8: Maintenance Release
+
+Editor
+
+ - Ensure subflow help is picked up for palette tooltip Fixes #2834
+ - Improve Ru locale (#2826) @alexk111
+ - Fix scrollbars (#2825) @alexk111
+
+Runtime
+
+ - Restrict project file access to inside the project directory
+ - Validate user-provided language parameter before passing to i18n
+ - Fix grunt release mkdir issue on Node.js 14 (#2827) @alexk111
+ - Prevent crash when coreNodesDir is empty (#2831) @hardillb
+
+Nodes
+
+ - Batch node: Fixing minor typo in node's documentation (#2848) @matthiasradde
+ - Split node: Handle out of order messages as long as one of the messages has msg.parts.count set to the proper value (#2748) @s4ke
+
+### 1.2.7: Maintenance Release
+
+Editor
+
+ - Ensure subflow-scoped config nodes do not get moved on import Fixes #2789
+ - Allow TypedInput to be disabled (#2752) @bartbutenaers
+ - Allow userMenu to be explicitly enabled (#2805) @tfmf
+ - Improvements to DE translation (#2192) @ketzu
+
+
+Runtime
+
+ - Handle `undefined` error passed to node.error (#2781) @johnwang71
+ - Disable nyc coverage reporting on older node versions
+ - Improve Editor API unit test coverage (#2777) @aaronmyatt
+
+
+Nodes
+
+ - Trigger: ensure timestamp option sends .now() at point of sending
+
+
+### 1.2.6: Maintenance Release
+
+
+Editor
+
+ - Update Japanese translations for 1.2.5 (#2764) @kazuhitoyokoi
+ - Library: properly handle symlinked folders (#2768) @natcl
+
+Runtime
+
+ - Support Windows paths when installing tarball by path name Fixes #2769
+ - Fix unsecure command usage in GH Action
+
+Nodes
+
+ - Update MQTT to latest to fix Node 8 URL breakage
+
+
+
+
 ### 1.2.5: Maintenance Release
 
 Editor
diff --git a/Gruntfile.js b/Gruntfile.js
index 6272e9818..23481f793 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -142,6 +142,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
                     "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/plugins.js",
                     "packages/node_modules/@node-red/editor-client/src/js/nodes.js",
                     "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
                     "packages/node_modules/@node-red/editor-client/src/js/history.js",
@@ -461,7 +462,8 @@ module.exports = function(grunt) {
                     'packages/node_modules/@node-red/runtime/lib/hooks.js',
                     'packages/node_modules/@node-red/util/**/*.js',
                     'packages/node_modules/@node-red/editor-api/lib/index.js',
-                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js'
+                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js',
+                    'packages/node_modules/@node-red/registry/lib/index.js'
                 ],
                 options: {
                     destination: 'docs',
@@ -623,6 +625,11 @@ module.exports = function(grunt) {
         'Builds editor content then runs code style checks and unit tests on all components',
         ['build','verifyPackageDependencies','jshint:editor','nyc:all']);
 
+    grunt.registerTask('no-coverage',
+        'Builds editor content then runs code style checks and unit tests on all components without code coverage',
+        ['build','verifyPackageDependencies','jshint:editor','simplemocha:all']);
+
+
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
         ['build','nyc:core']);
diff --git a/package.json b/package.json
index 15abf0507..2f3dfa520 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     ],
     "dependencies": {
         "ajv": "6.12.6",
-        "async-mutex": "0.2.4",
+        "async-mutex": "0.2.6",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
@@ -38,7 +38,7 @@
         "cookie-parser": "1.4.5",
         "cors": "2.8.5",
         "cron": "1.7.2",
-        "denque": "1.4.1",
+        "denque": "1.5.0",
         "express": "4.17.1",
         "express-session": "1.17.1",
         "fs-extra": "8.1.0",
@@ -54,11 +54,11 @@
         "lodash.clonedeep": "^4.5.0",
         "media-typer": "1.1.0",
         "memorystore": "1.6.4",
-        "mime": "2.4.6",
+        "mime": "2.4.7",
         "moment-timezone": "0.5.32",
-        "mqtt": "4.2.5",
+        "mqtt": "4.2.6",
         "multer": "1.4.2",
-        "mustache": "4.0.1",
+        "mustache": "4.1.0",
         "node-red-admin": "^0.2.6",
         "node-red-node-rbe": "^0.2.9",
         "node-red-node-sentiment": "^0.1.6",
@@ -73,8 +73,7 @@
         "request": "2.88.0",
         "semver": "6.3.0",
         "tar": "6.0.5",
-        "uglify-js": "3.11.6",
-        "when": "3.7.8",
+        "uglify-js": "3.12.4",
         "ws": "6.2.1",
         "xml2js": "0.4.23"
     },
@@ -82,7 +81,7 @@
         "bcrypt": "3.0.8"
     },
     "devDependencies": {
-        "dompurify": "2.2.2",
+        "dompurify": "2.2.6",
         "grunt": "1.3.0",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.3.2",
@@ -97,17 +96,17 @@
         "grunt-jsdoc": "2.4.1",
         "grunt-jsdoc-to-markdown": "5.0.0",
         "grunt-jsonlint": "2.1.3",
-        "grunt-mkdir": "~1.0.0",
+        "grunt-mkdir": "~1.1.0",
         "grunt-npm-command": "~0.1.2",
         "grunt-sass": "~3.1.0",
         "grunt-simple-mocha": "~0.4.1",
         "grunt-simple-nyc": "^3.0.1",
         "http-proxy": "1.18.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "1.2.4",
+        "marked": "1.2.7",
         "minami": "1.2.3",
         "mocha": "^5.2.0",
-        "node-red-node-test-helper": "^0.2.5",
+        "node-red-node-test-helper": "^0.2.6",
         "node-sass": "^4.14.1",
         "nodemon": "2.0.6",
         "should": "13.2.3",
diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/index.js b/packages/node_modules/@node-red/editor-api/lib/admin/index.js
index ff32111f5..cf3505439 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/index.js
@@ -22,6 +22,7 @@ var flow = require("./flow");
 var context = require("./context");
 var auth = require("../auth");
 var info = require("./settings");
+var plugins = require("./plugins");
 
 var apiUtil = require("../util");
 
@@ -32,6 +33,7 @@ module.exports = {
         nodes.init(runtimeAPI);
         context.init(runtimeAPI);
         info.init(settings,runtimeAPI);
+        plugins.init(runtimeAPI);
 
         var needsPermission = auth.needsPermission;
 
@@ -50,12 +52,14 @@ module.exports = {
         // Nodes
         adminApp.get("/nodes",needsPermission("nodes.read"),nodes.getAll,apiUtil.errorHandler);
 
-        if (!settings.editorTheme || !settings.editorTheme.palette || settings.editorTheme.palette.upload !== false) {
-            const multer  = require('multer');
-            const upload = multer({ storage: multer.memoryStorage() });
-            adminApp.post("/nodes",needsPermission("nodes.write"),upload.single("tarball"),nodes.post,apiUtil.errorHandler);
-        } else {
-            adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
+        if (!settings.externalModules || !settings.externalModules.palette || settings.externalModules.palette.allowInstall !== false) {
+            if (!settings.externalModules || !settings.externalModules.palette || settings.externalModules.palette.allowUpload !== false) {
+                const multer  = require('multer');
+                const upload = multer({ storage: multer.memoryStorage() });
+                adminApp.post("/nodes",needsPermission("nodes.write"),upload.single("tarball"),nodes.post,apiUtil.errorHandler);
+            } else {
+                adminApp.post("/nodes",needsPermission("nodes.write"),nodes.post,apiUtil.errorHandler);
+            }
         }
         adminApp.get(/^\/nodes\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalogs,apiUtil.errorHandler);
         adminApp.get(/^\/nodes\/((@[^\/]+\/)?[^\/]+\/[^\/]+)\/messages/,needsPermission("nodes.read"),nodes.getModuleCatalog,apiUtil.errorHandler);
@@ -78,6 +82,10 @@ module.exports = {
 
         adminApp.get("/settings",needsPermission("settings.read"),info.runtimeSettings,apiUtil.errorHandler);
 
+        // Plugins
+        adminApp.get("/plugins", needsPermission("plugins.read"), plugins.getAll, apiUtil.errorHandler);
+        adminApp.get("/plugins/messages", needsPermission("plugins.read"), plugins.getCatalogs, apiUtil.errorHandler);
+
         return adminApp;
     }
 }
diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
index 187bd823f..058053a29 100644
--- a/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/nodes.js
@@ -60,6 +60,7 @@ module.exports = {
         runtimeAPI.nodes.addModule(opts).then(function(info) {
             res.json(info);
         }).catch(function(err) {
+            console.log(err.stack);
             apiUtils.rejectHandler(req,res,err);
         })
     },
diff --git a/packages/node_modules/@node-red/editor-api/lib/admin/plugins.js b/packages/node_modules/@node-red/editor-api/lib/admin/plugins.js
new file mode 100644
index 000000000..3d49a7e8a
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-api/lib/admin/plugins.js
@@ -0,0 +1,46 @@
+var apiUtils = require("../util");
+
+var runtimeAPI;
+
+module.exports = {
+    init: function(_runtimeAPI) {
+        runtimeAPI = _runtimeAPI;
+    },
+    getAll: function(req,res) {
+        var opts = {
+            user: req.user,
+            req: apiUtils.getRequestLogObject(req)
+        }
+        if (req.get("accept") == "application/json") {
+            runtimeAPI.plugins.getPluginList(opts).then(function(list) {
+                res.json(list);
+            })
+        } else {
+            opts.lang = apiUtils.determineLangFromHeaders(req.acceptsLanguages());
+            if (/[^a-z\-\*]/i.test(opts.lang)) {
+                res.json({});
+                return;
+            }
+            runtimeAPI.plugins.getPluginConfigs(opts).then(function(configs) {
+                res.send(configs);
+            })
+        }
+    },
+    getCatalogs: function(req,res) {
+        var opts = {
+            user: req.user,
+            lang: req.query.lng,
+            req: apiUtils.getRequestLogObject(req)
+        }
+        if (/[^a-z\-\*]/i.test(opts.lang)) {
+            res.json({});
+            return;
+        }
+        runtimeAPI.plugins.getPluginCatalogs(opts).then(function(result) {
+            res.json(result);
+        }).catch(function(err) {
+            console.log(err.stack);
+            apiUtils.rejectHandler(req,res,err);
+        })
+    }
+};
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/index.js b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
index 71876eaa6..2e8333f3f 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/index.js
@@ -76,7 +76,7 @@ module.exports = {
             editorApp.get("/icons/:scope/:module/:icon",ui.icon);
 
             var theme = require("./theme");
-            theme.init(settings);
+            theme.init(settings, runtimeAPI);
             editorApp.use("/theme",theme.app());
             editorApp.use("/",ui.editorResources);
 
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/library.js b/packages/node_modules/@node-red/editor-api/lib/editor/library.js
index 47a41bb7b..89b92fd11 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/library.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/library.js
@@ -17,7 +17,6 @@
 var apiUtils = require("../util");
 var fs = require('fs');
 var fspath = require('path');
-var when = require('when');
 
 var runtimeAPI;
 
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
index a7f300cd3..f9453f55b 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/locales.js
@@ -39,9 +39,12 @@ module.exports = {
     },
     get: function(req,res) {
         var namespace = req.params[0];
-        var lngs = req.query.lng;
         namespace = namespace.replace(/\.json$/,"");
         var lang = req.query.lng || i18n.defaultLang; //apiUtil.determineLangFromHeaders(req.acceptsLanguages() || []);
+        if (/[^a-z\-\*]/i.test(lang)) {
+            res.json({});
+            return;
+        }
         var prevLang = i18n.i.language;
         // Trigger a load from disk of the language if it is not the default
         i18n.i.changeLanguage(lang, function(){
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
index 17dbbafea..52f7974ec 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -41,6 +41,10 @@ var theme = null;
 var themeContext = clone(defaultContext);
 var themeSettings = null;
 
+var activeTheme = null;
+var activeThemeInitialised = false;
+
+var runtimeAPI;
 var themeApp;
 
 function serveFile(app,baseUrl,file) {
@@ -58,7 +62,7 @@ function serveFile(app,baseUrl,file) {
     }
 }
 
-function serveFilesFromTheme(themeValue, themeApp, directory) {
+function serveFilesFromTheme(themeValue, themeApp, directory, baseDirectory) {
     var result = [];
     if (themeValue) {
         var array = themeValue;
@@ -67,7 +71,14 @@ function serveFilesFromTheme(themeValue, themeApp, directory) {
         }
 
         for (var i=0;i<array.length;i++) {
-            var url = serveFile(themeApp,directory,array[i]);
+            let fullPath = array[i];
+            if (baseDirectory) {
+                fullPath = path.resolve(baseDirectory,array[i]);
+                if (fullPath.indexOf(baseDirectory) !== 0) {
+                    continue;
+                }
+            }
+            var url = serveFile(themeApp,directory,fullPath);
             if (url) {
                 result.push(url);
             }
@@ -77,10 +88,12 @@ function serveFilesFromTheme(themeValue, themeApp, directory) {
 }
 
 module.exports = {
-    init: function(settings) {
+    init: function(settings, _runtimeAPI) {
+        runtimeAPI = _runtimeAPI;
         themeContext = clone(defaultContext);
         themeSettings = null;
         theme = settings.editorTheme || {};
+        activeTheme = theme.theme;
     },
 
     app: function() {
@@ -169,7 +182,9 @@ module.exports = {
                 }
             }
         }
-        themeApp.get("/", function(req,res) {
+        themeApp.get("/", async function(req,res) {
+            const themePluginList = await runtimeAPI.plugins.getPluginsByType({type:"node-red-theme"});
+            themeContext.themes = themePluginList.map(theme => theme.id);
             res.json(themeContext);
         })
 
@@ -185,10 +200,38 @@ module.exports = {
             themeSettings.projects = theme.projects;
         }
 
-
+        if (theme.theme) {
+            themeSettings.theme = theme.theme;
+        }
         return themeApp;
     },
-    context: function() {
+    context: async function() {
+        if (activeTheme && !activeThemeInitialised) {
+            const themePlugin = await runtimeAPI.plugins.getPlugin({
+                id:activeTheme
+            });
+            if (themePlugin) {
+                if (themePlugin.css) {
+                    const cssFiles = serveFilesFromTheme(
+                        themePlugin.css,
+                        themeApp,
+                        "/css/",
+                        themePlugin.path
+                    );
+                    themeContext.page.css = cssFiles.concat(themeContext.page.css || [])
+                }
+                if (themePlugin.scripts) {
+                    const scriptFiles = serveFilesFromTheme(
+                        themePlugin.scripts,
+                        themeApp,
+                        "/scripts/",
+                        themePlugin.path
+                    )
+                    themeContext.page.scripts = scriptFiles.concat(themeContext.page.scripts || [])
+                }
+            }
+            activeThemeInitialised = true;
+        }
         return themeContext;
     },
     settings: function() {
diff --git a/packages/node_modules/@node-red/editor-api/lib/editor/ui.js b/packages/node_modules/@node-red/editor-api/lib/editor/ui.js
index 24b819fec..a4812a668 100644
--- a/packages/node_modules/@node-red/editor-api/lib/editor/ui.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/ui.js
@@ -68,8 +68,8 @@ module.exports = {
             apiUtils.rejectHandler(req,res,err);
         })
     },
-    editor: function(req,res) {
-        res.send(Mustache.render(editorTemplate,theme.context()));
+    editor: async function(req,res) {
+        res.send(Mustache.render(editorTemplate,await theme.context()));
     },
     editorResources: express.static(path.join(editorClientDir,'public'))
 };
diff --git a/packages/node_modules/@node-red/editor-api/lib/index.js b/packages/node_modules/@node-red/editor-api/lib/index.js
index 457b99cc9..f66e9094b 100644
--- a/packages/node_modules/@node-red/editor-api/lib/index.js
+++ b/packages/node_modules/@node-red/editor-api/lib/index.js
@@ -28,7 +28,6 @@ var express = require("express");
 var bodyParser = require("body-parser");
 var util = require('util');
 var passport = require('passport');
-var when = require('when');
 var cors = require('cors');
 
 var auth = require("./auth");
@@ -60,8 +59,8 @@ function init(settings,_server,storage,runtimeAPI) {
         adminApp.use(corsHandler);
 
         if (settings.httpAdminMiddleware) {
-            if (typeof settings.httpAdminMiddleware === "function") {
-                adminApp.use(settings.httpAdminMiddleware)
+            if (typeof settings.httpAdminMiddleware === "function" || Array.isArray(settings.httpAdminMiddleware)) {
+                adminApp.use(settings.httpAdminMiddleware);
             }
         }
 
@@ -111,11 +110,9 @@ function init(settings,_server,storage,runtimeAPI) {
  * @return {Promise} resolves when the application is ready to handle requests
  * @memberof @node-red/editor-api
  */
-function start() {
+async function start() {
     if (editor) {
         return editor.start();
-    } else {
-        return when.resolve();
     }
 }
 
@@ -124,11 +121,10 @@ function start() {
  * @return {Promise} resolves when the application is stopped
  * @memberof @node-red/editor-api
  */
-function stop() {
+async function stop() {
     if (editor) {
         editor.stop();
     }
-    return when.resolve();
 }
 module.exports = {
     init: init,
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 6885aaabb..0b9ebb224 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -25,14 +25,13 @@
         "express-session": "1.17.1",
         "express": "4.17.1",
         "memorystore": "1.6.4",
-        "mime": "2.4.6",
+        "mime": "2.4.7",
         "multer": "1.4.2",
-        "mustache": "4.0.1",
+        "mustache": "4.1.0",
         "oauth2orize": "1.11.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "passport": "0.4.1",
-        "when": "3.7.8",
         "ws": "6.2.1"
     },
     "optionalDependencies": {
diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
index 0c8dd42eb..7c408d742 100755
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@@ -32,7 +32,7 @@
     "label" : {
       "view" : {
         "view" : "Ansicht",
-        "grid" : "Gitter",
+        "grid" : "Raster",
         "showGrid" : "Raster anzeigen",
         "snapGrid" : "Am Raster ausrichten",
         "gridSize" : "Rastergröße",
diff --git 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
index 0b92fc18c..99eb34a3f 100755
--- 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
@@ -38,6 +38,7 @@
         }
     },
     "event": {
+        "loadPlugins": "Loading Plugins",
         "loadPalette": "Loading Palette",
         "loadNodeCatalogs": "Loading Node catalogs",
         "loadNodes": "Loading Nodes __count__",
@@ -337,8 +338,21 @@
         "output": "outputs:",
         "status": "status node",
         "deleteSubflow": "delete subflow",
+        "confirmDelete": "Are you sure you want to delete this subflow?",
         "info": "Description",
         "category": "Category",
+        "module": "Module",
+        "license": "License",
+        "licenseNone": "none",
+        "licenseOther": "Other",
+        "type": "Node Type",
+        "version": "Version",
+        "versionPlaceholder": "x.y.z",
+        "keys": "Keywords",
+        "keysPlaceholder": "Comma-separated keywords",
+        "author": "Author",
+        "authorPlaceholder": "Your Name <email@example.com>",
+        "desc": "Description",
         "env": {
             "restore": "Restore to subflow default",
             "remove": "Remove environment variable"
@@ -385,6 +399,7 @@
         "icon": "Icon",
         "inputType": "Input type",
         "selectType": "select types...",
+        "loadCredentials": "Loading node credentials",
         "inputs" : {
             "input": "input",
             "select": "select",
@@ -419,7 +434,8 @@
         },
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it",
-            "invalidProperties": "Invalid properties:"
+            "invalidProperties": "Invalid properties:",
+            "credentialLoadFailed": "Failed to load node credentials"
         }
     },
     "keyboard": {
@@ -1079,6 +1095,7 @@
     "editor-tab": {
         "properties": "Properties",
         "envProperties": "Environment Variables",
+        "module": "Module Properties",
         "description": "Description",
         "appearance": "Appearance",
         "preview": "UI Preview",
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
index 57ebb00a7..282dfe551 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "Returns the one and only value in the `array` parameter that satisfies the `function` predicate (i.e. the `function` returns Boolean `true` when passed the value).  Throws an exception if the number of matching values is not exactly one.\n\nThe function should be supplied in the following signature: `function(value [, index [, array]])` where value is each input of the array, index is the position of that value and the whole array is passed as the third argument"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "Encodes a Uniform Resource Locator (URL) component by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character.\n\nExample: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "Encodes a Uniform Resource Locator (URL) by replacing each instance of certain characters by one, two, three, or four escape sequences representing the UTF-8 encoding of the character. \n\nExample: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "Decodes a Uniform Resource Locator (URL) component previously created by encodeUrlComponent. \n\nExample: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "Decodes a Uniform Resource Locator (URL) previously created by encodeUrl. \n\nExample: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 723bee1cd..5419d2a93 100644
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -38,6 +38,7 @@
         }
     },
     "event": {
+        "loadPlugins": "プラグインを読み込み中",
         "loadPalette": "パレットを読み込み中",
         "loadNodeCatalogs": "ノードカタログを読み込み中",
         "loadNodes": "ノードを読み込み中 __count__",
@@ -85,7 +86,7 @@
             "userSettings": "ユーザ設定",
             "nodes": "ノード",
             "displayStatus": "ノードのステータスを表示",
-            "displayConfig": "ノードの設定",
+            "displayConfig": "設定ノード",
             "import": "読み込み",
             "export": "書き出し",
             "search": "ノードを検索",
@@ -203,8 +204,8 @@
         "replacedNodes_plural": "置換された __count__ 個のノード",
         "pasteNodes": "JSON形式のフローデータを貼り付け",
         "selectFile": "読み込むファイルを選択",
-        "importNodes": "フローをクリップボードから読み込み",
-        "exportNodes": "フローをクリップボードへ書き出し",
+        "importNodes": "フローを読み込み",
+        "exportNodes": "フローを書き出し",
         "download": "ダウンロード",
         "importUnrecognised": "認識できない型が読み込まれました:",
         "importUnrecognised_plural": "認識できない型が読み込まれました:",
@@ -266,7 +267,7 @@
         "successfulDeploy": "デプロイが成功しました",
         "successfulRestart": "フローの再起動が成功しました",
         "deployFailed": "デプロイが失敗しました: __message__",
-        "unusedConfigNodes": "使われていない「ノードの設定」があります。",
+        "unusedConfigNodes": "使われていない設定ノードがあります。",
         "unusedConfigNodesLink": "設定を参照する",
         "errors": {
             "noResponse": "サーバの応答がありません"
@@ -337,8 +338,21 @@
         "output": "出力:",
         "status": "ステータスノード",
         "deleteSubflow": "サブフローを削除",
+        "confirmDelete": "このサブフローを削除しても良いですか？",
         "info": "詳細",
         "category": "カテゴリ",
+        "module": "モジュール",
+        "license": "ライセンス",
+        "licenseNone": "なし",
+        "licenseOther": "その他",
+        "type": "ノードの型",
+        "version": "バージョン",
+        "versionPlaceholder": "x.y.z",
+        "keys": "キーワード",
+        "keysPlaceholder": "カンマ区切りのキーワード",
+        "author": "作者",
+        "authorPlaceholder": "名前 <email@example.com>",
+        "desc": "説明",
         "env": {
             "restore": "デフォルト値に戻す",
             "remove": "環境変数を削除"
@@ -362,9 +376,9 @@
         "configDelete": "削除",
         "nodesUse": "__count__ 個のノードが、この設定を使用しています",
         "nodesUse_plural": "__count__ 個のノードが、この設定を使用しています",
-        "addNewConfig": "新規に __type__ ノードの設定を追加",
+        "addNewConfig": "新規に __type__ 設定ノードを追加",
         "editNode": "__type__ ノードを編集",
-        "editConfig": "__type__ ノードの設定を編集",
+        "editConfig": "__type__ 設定ノードを編集",
         "addNewType": "新規に __type__ を追加...",
         "nodeProperties": "プロパティ",
         "label": "ラベル",
@@ -385,6 +399,7 @@
         "icon": "記号",
         "inputType": "入力形式",
         "selectType": "形式選択...",
+        "loadCredentials": "ノードの認証情報を読み込み中",
         "inputs": {
             "input": "入力",
             "select": "メニュー",
@@ -419,7 +434,8 @@
         },
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします",
-            "invalidProperties": "プロパティが不正です:"
+            "invalidProperties": "プロパティが不正です:",
+            "credentialLoadFailed": "ノードの認証情報の読み込みに失敗"
         }
     },
     "keyboard": {
@@ -637,8 +653,8 @@
             "noHelp": "ヘルプのトピックが未選択"
         },
         "config": {
-            "name": "ノードの設定を表示",
-            "label": "ノードの設定",
+            "name": "設定ノードを表示",
+            "label": "設定ノード",
             "global": "全てのフロー上",
             "none": "なし",
             "subflows": "サブフロー",
@@ -1079,6 +1095,7 @@
     "editor-tab": {
         "properties": "プロパティ",
         "envProperties": "環境変数",
+        "module": "モジュールプロパティ",
         "description": "説明",
         "appearance": "外観",
         "preview": "UIプレビュー",
@@ -1089,6 +1106,7 @@
         "en-US": "英語",
         "ja": "日本語",
         "ko": "韓国語",
+        "ru": "ロシア語",
         "zh-CN": "中国語(簡体)",
         "zh-TW": "中国語(繁体)"
     }
diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
index 02973a69a..7f96c747a 100644
--- a/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/jsonata.json
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "`array`の要素のうち、条件判定関数`function`を満たす(`function`に与えた場合に真偽値`true`を返す)要素が1つのみである場合、それを返します。マッチする要素が1つのみでない場合、例外を送出します。\n\n指定する関数は`function(value [, index [, array]])`というシグネチャでなければなりません。ここで、`value`は`array`の要素値、`index`は要素の添字、第三引数には配列全体を渡します。"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "Uniform Resource Locator (URL)を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "Uniform Resource Locator (URL)要素を構成する文字を1、2、3、もしくは、4文字エスケープシーケンスのUTF-8文字エンコーディングで置換します。\n\n例: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "encodeUrlComponentで置換したUniform Resource Locator (URL)をデコードします。\n\n例: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "encodeUrlで置換したUniform Resource Locator (URL)要素をデコードします。 \n\n例: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },
diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
index 1f91d4b0b..04ff361ba 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
@@ -246,8 +246,8 @@
         "import": {
             "import": "Импортировать в",
             "importSelected": "Импортировать выбранные",
-            "importCopy": "Импортировать копию",
-            "viewNodes": "Посмотреть узлы...",
+            "importCopy": "Импортировать копии",
+            "viewNodes": "Показать узлы...",
             "newFlow": "новый поток",
             "replace": "заменить",
             "errors": {
@@ -257,7 +257,7 @@
                 "missingType": "Недопустимый поток - у элемента __index__ отсутствует свойство 'type'"
             },
             "conflictNotification1": "Некоторые импортируемые Вами узлы уже существуют в рабочей области.",
-            "conflictNotification2": "Выберите, какие узлы импортировать и следует ли заменить существующие узлы или импортировать их копию."
+            "conflictNotification2": "Выберите, какие узлы импортировать и следует ли заменить ими существующие узлы или импортировать их копии."
         },
         "copyMessagePath": "Путь скопирован",
         "copyMessageValue": "Значение скопировано",
@@ -373,12 +373,12 @@
         "configAdd": "Добавить",
         "configUpdate": "Обновить",
         "configDelete": "Удалить",
-        "nodesUse": "__count__ узел использует эту конфигурацию",
-        "nodesUse_plural_2": "__count__ узла используют эту конфигурацию",
-        "nodesUse_plural_5": "__count__ узлов используют эту конфигурацию",
-        "addNewConfig": "Добавить новый конфигурационный узел __type__",
+        "nodesUse": "__count__ узел использует этот конфиг",
+        "nodesUse_plural_2": "__count__ узла используют этот конфиг",
+        "nodesUse_plural_5": "__count__ узлов используют этот конфиг",
+        "addNewConfig": "Добавить новый конфиг узел __type__",
         "editNode": "Изменить узел __type__",
-        "editConfig": "Изменить конфигурационный узел __type__",
+        "editConfig": "Изменить конфиг узел __type__",
         "addNewType": "Добавить новый __type__...",
         "nodeProperties": "свойства узла",
         "label": "Метка",
@@ -615,7 +615,7 @@
         "info": {
             "name": "Информация",
             "tabName": "Имя",
-            "label": "сведения",
+            "label": "инфо",
             "node": "Узел",
             "type": "Тип",
             "group": "Группа",
@@ -648,8 +648,8 @@
             "showTips":"Вы можете открыть советы из панели настроек",
             "outline": "Структура",
             "empty": "пусто",
-            "globalConfig": "Узлы глобальной конфигурации",
-            "triggerAction": "Запустить действие",
+            "globalConfig": "Глобальные конфиг узлы",
+            "triggerAction": "Вызвать действие",
             "find": "Найти в рабочей области",
             "search": {
                 "configNodes": "Узлы конфигурации",
@@ -671,8 +671,8 @@
         },
         "config": {
             "name": "Узлы конфигураций",
-            "label": "конфигурация",
-            "global": "На всех потока",
+            "label": "конфиг",
+            "global": "На всех потоках",
             "none": "нет",
             "subflows": "подпотоки",
             "flows": "потоки",
@@ -690,8 +690,8 @@
             "none": "ничего не выбрано",
             "refresh": "обновите, чтобы загрузить",
             "empty": "пусто",
-            "node": "Узел",
-            "flow": "Поток",
+            "node": "Узловой",
+            "flow": "Потоковый",
             "global": "Глобальный",
             "deleteConfirm": "Вы уверены, что хотите удалить этот элемент?",
             "autoRefresh": "Обновить при изменении выбора",
@@ -877,7 +877,7 @@
             "bool": "логический тип",
             "json": "JSON",
             "bin": "буфер",
-            "date": "отметка времени",
+            "date": "метка времени",
             "jsonata": "выражение",
             "env": "переменная среды",
             "cred": "учетные данные"
diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
index fd0ecf24c..920042c25 100755
--- a/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/jsonata.json
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "Возвращает одно-единственное значение из массива `array`, которое удовлетворяет предикату `function` (то есть когда `function` возвращает логическое `true` при передаче значения). Выдает исключение, если число подходящих значений не одно.\n\nФункция должна соответствовать следующей сигнатуре: `function(value [, index [, array]])` где value - элемент массива, index - позиция этого значения, а весь массив передается в качестве третьего аргумента"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "Кодирует компонент Uniform Resource Locator (URL), заменяя каждый экземпляр определенных символов одной, двумя, тремя или четырьмя escape-последовательностями, представляющими кодировку UTF-8 символа.\n\nПример: `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "Кодирует Uniform Resource Locator (URL), заменяя каждый экземпляр определенных символов одной, двумя, тремя или четырьмя escape-последовательностями, представляющими кодировку UTF-8 символа.\n\nПример: `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "Декодирует компонент Uniform Resource Locator (URL), ранее созданный с помощью encodeUrlComponent.\n\nПример: `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "Декодирует компонент Uniform Resource Locator (URL), ранее созданный с помощью encodeUrl. \n\nПример: `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },
diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
index a9e6a7b1f..b4403e318 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/jsonata.json
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "返回满足参数function谓语的array参数中的唯一值 (比如：传递值时，函数返回布尔值“true”)。如果匹配值的数量不唯一时，则抛出异常。\n\n应在以下签名中提供函数： `function（value [，index [，array []]]）` 其中value是数组的每个输入，index是该值的位置，整个数组作为第三个参数传递。"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）组件进行编码。\n\n示例： `$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "通过用表示字符的UTF-8编码的一个，两个，三个或四个转义序列替换某些字符的每个实例，对统一资源定位符（URL）进行编码。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "解码以前由encodeUrlComponent创建的统一资源定位器（URL）组件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "解码先前由encodeUrl创建的统一资源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },
diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
index 3765ab3dd..2b47c1af7 100644
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/jsonata.json
@@ -243,19 +243,19 @@
         "args": "array, function",
         "desc": "返回滿足參數function謂語的array參數中的唯一值 (比如：傳遞值時，函數返回布林值“true”)。如果匹配值的數量不唯一時，則拋出異常。\n\n應在以下簽名中提供函數：`function（value [，index [，array []]]）`其中value是數組的每個輸入，index是該值的位置，整個數組作為第三個參數傳遞。"
     },
-    "$encodeUrl": {
+    "$encodeUrlComponent": {
         "args": "str",
         "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）組件進行編碼。\n\n示例：`$encodeUrlComponent(\"?x=test\")` => `\"%3Fx%3Dtest\"`"
     },
-    "$encodeUrlComponent": {
+    "$encodeUrl": {
         "args": "str",
         "desc": "通過用表示字符的UTF-8編碼的一個，兩個，三個或四個轉義序列替換某些字符的每個實例，對統一資源定位符（URL）進行編碼。\n\n示例： `$encodeUrl(\"https://mozilla.org/?x=шеллы\")` => `\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\"`"
     },
-    "$decodeUrl": {
+    "$decodeUrlComponent": {
         "args": "str",
         "desc": "解碼以前由encodeUrlComponent創建的統一資源定位器（URL）組件。 \n\n示例： `$decodeUrlComponent(\"%3Fx%3Dtest\")` => `\"?x=test\"`"
     },
-    "$decodeUrlComponent": {
+    "$decodeUrl": {
         "args": "str",
         "desc": "解碼先前由encodeUrl創建的統一資源定位符（URL）。 \n\n示例： `$decodeUrl(\"https://mozilla.org/?x=%D1%88%D0%B5%D0%BB%D0%BB%D1%8B\")` => `\"https://mozilla.org/?x=шеллы\"`"
     },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index a3392fd26..7fedf84be 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -343,17 +343,29 @@ RED.history = (function() {
                     if (ev.changes.hasOwnProperty(i)) {
                         inverseEv.changes[i] = ev.node[i];
                         if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
-                            // This is a config node property
-                            var currentConfigNode = RED.nodes.node(ev.node[i]);
-                            if (currentConfigNode) {
-                                currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
-                                RED.events.emit("nodes:change",currentConfigNode);
+                            // This property is a reference to another node or nodes.
+                            var nodeList = ev.node[i];
+                            if (!Array.isArray(nodeList)) {
+                                nodeList = [nodeList];
                             }
-                            var newConfigNode = RED.nodes.node(ev.changes[i]);
-                            if (newConfigNode) {
-                                newConfigNode.users.push(ev.node);
-                                RED.events.emit("nodes:change",newConfigNode);
+                            nodeList.forEach(function(id) {
+                                var currentConfigNode = RED.nodes.node(id);
+                                if (currentConfigNode && currentConfigNode._def.category === "config") {
+                                    currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
+                                    RED.events.emit("nodes:change",currentConfigNode);
+                                }
+                            });
+                            nodeList = ev.changes[i];
+                            if (!Array.isArray(nodeList)) {
+                                nodeList = [nodeList];
                             }
+                            nodeList.forEach(function(id) {
+                                var newConfigNode = RED.nodes.node(id);
+                                if (newConfigNode && newConfigNode._def.category === "config") {
+                                    newConfigNode.users.push(ev.node);
+                                    RED.events.emit("nodes:change",newConfigNode);
+                                }
+                            });
                         }
                         ev.node[i] = ev.changes[i];
                     }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/i18n.js b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
index f1d0edfaf..ac439ecbc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/i18n.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
@@ -108,6 +108,31 @@ RED.i18n = (function() {
                     }
                 });
             })
+        },
+
+        loadPluginCatalogs: function(done) {
+            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var toLoad = languageList.length;
+
+            languageList.forEach(function(lang) {
+                $.ajax({
+                    headers: {
+                        "Accept":"application/json"
+                    },
+                    cache: false,
+                    url: apiRootUrl+'plugins/messages?lng='+lang,
+                    success: function(data) {
+                        var namespaces = Object.keys(data);
+                        namespaces.forEach(function(ns) {
+                            i18n.addResourceBundle(lang,ns,data[ns]);
+                        });
+                        toLoad--;
+                        if (toLoad === 0) {
+                            done();
+                        }
+                    }
+                });
+            })
         }
     }
 })();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index ddeea65e6..236f7fa57 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -164,6 +164,21 @@ RED.nodes = (function() {
 
                     // TODO: too tightly coupled into palette UI
                 }
+                if (def.defaults) {
+                    for (var d in def.defaults) {
+                        if (def.defaults.hasOwnProperty(d)) {
+                            if (def.defaults[d].type) {
+                                try {
+                                    def.defaults[d]._type = parseNodePropertyTypeString(def.defaults[d].type)
+                                } catch(err) {
+                                    console.warn(err);
+                                }
+                            }
+                        }
+                    }
+                }
+
+
                 RED.events.emit("registry:node-type-added",nt);
             },
             removeNodeType: function(nt) {
@@ -193,6 +208,59 @@ RED.nodes = (function() {
         return (1+Math.random()*4294967295).toString(16);
     }
 
+    function parseNodePropertyTypeString(typeString) {
+        typeString = typeString.trim();
+        var c;
+        var pos = 0;
+        var isArray = /\[\]$/.test(typeString);
+        if (isArray) {
+            typeString = typeString.substring(0,typeString.length-2);
+        }
+
+        var l = typeString.length;
+        var inBrackets = false;
+        var inToken = false;
+        var currentToken = "";
+        var types = [];
+        while (pos < l) {
+            c = typeString[pos];
+            if (inToken) {
+                if (c === "|") {
+                    types.push(currentToken.trim())
+                    currentToken = "";
+                    inToken = false;
+                } else if (c === ")") {
+                    types.push(currentToken.trim())
+                    currentToken = "";
+                    inBrackets = false;
+                    inToken = false;
+                } else {
+                    currentToken += c;
+                }
+            } else {
+                if (c === "(") {
+                    if (inBrackets) {
+                        throw new Error("Invalid character '"+c+"' at position "+pos)
+                    }
+                    inBrackets = true;
+                } else if (c !== " ") {
+                    inToken = true;
+                    currentToken = c;
+                }
+            }
+            pos++;
+        }
+        currentToken = currentToken.trim();
+        if (currentToken.length > 0) {
+            types.push(currentToken)
+        }
+        return {
+            types: types,
+            array: isArray
+        }
+    }
+
+
     function addNode(n) {
         if (n.type.indexOf("subflow") !== 0) {
             n["_"] = n._def._;
@@ -670,6 +738,7 @@ RED.nodes = (function() {
         node.in = [];
         node.out = [];
         node.env = n.env;
+        node.meta = n.meta;
 
         if (exportCreds) {
             var credentialSet = {};
@@ -780,6 +849,12 @@ RED.nodes = (function() {
                             subflowSet.push(n);
                         }
                     });
+                    RED.nodes.eachConfig(function(n) {
+                        if (n.z == subflowId) {
+                            subflowSet.push(n);
+                            exportedConfigNodes[n.id] = true;
+                        }
+                    });
                     var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                     nns = exportableSubflow.concat(nns);
                 }
@@ -787,16 +862,29 @@ RED.nodes = (function() {
             if (node.type !== "subflow") {
                 var convertedNode = RED.nodes.convertNode(node);
                 for (var d in node._def.defaults) {
-                    if (node._def.defaults[d].type && node[d] in configNodes) {
-                        var confNode = configNodes[node[d]];
-                        var exportable = registry.getNodeType(node._def.defaults[d].type).exportable;
-                        if ((exportable == null || exportable)) {
-                            if (!(node[d] in exportedConfigNodes)) {
-                                exportedConfigNodes[node[d]] = true;
-                                set.push(confNode);
+                    if (node._def.defaults[d].type) {
+                        var nodeList = node[d];
+                        if (!Array.isArray(nodeList)) {
+                            nodeList = [nodeList];
+                        }
+                        nodeList = nodeList.filter(function(id) {
+                            if (id in configNodes) {
+                                var confNode = configNodes[id];
+                                if (confNode._def.exportable !== false) {
+                                    if (!(id in exportedConfigNodes)) {
+                                        exportedConfigNodes[id] = true;
+                                        set.push(confNode);
+                                        return true;
+                                    }
+                                }
+                                return false;
                             }
+                            return true;
+                        })
+                        if (nodeList.length === 0) {
+                            convertedNode[d] = Array.isArray(node[d])?[]:""
                         } else {
-                            convertedNode[d] = "";
+                            convertedNode[d] = Array.isArray(node[d])?nodeList:nodeList[0]
                         }
                     }
                 }
@@ -1360,7 +1448,7 @@ RED.nodes = (function() {
                         }
                     }
                 } else {
-                    if (n.z && !workspaces[n.z]) {
+                    if (n.z && !workspaces[n.z] && !subflow_map[n.z]) {
                         n.z = activeWorkspace;
                     }
                 }
@@ -1587,15 +1675,6 @@ RED.nodes = (function() {
                 }
             }
         }
-        // TODO: make this a part of the node definition so it doesn't have to
-        //       be hardcoded here
-        var nodeTypeArrayReferences = {
-            "catch":"scope",
-            "status":"scope",
-            "complete": "scope",
-            "link in":"links",
-            "link out":"links"
-        }
 
         // Remap all wires and config node references
         for (i=0;i<new_nodes.length;i++) {
@@ -1624,19 +1703,24 @@ RED.nodes = (function() {
             }
             for (var d3 in n._def.defaults) {
                 if (n._def.defaults.hasOwnProperty(d3)) {
-                    if (n._def.defaults[d3].type && node_map[n[d3]]) {
-                        configNode = node_map[n[d3]];
-                        n[d3] = configNode.id;
-                        if (configNode.users.indexOf(n) === -1) {
-                            configNode.users.push(n);
+                    if (n._def.defaults[d3].type) {
+                        var nodeList = n[d3];
+                        if (!Array.isArray(nodeList)) {
+                            nodeList = [nodeList];
                         }
-                    } else if (nodeTypeArrayReferences.hasOwnProperty(n.type) && nodeTypeArrayReferences[n.type] === d3 && n[d3] !== undefined && n[d3] !== null) {
-                        for (var j = 0;j<n[d3].length;j++) {
-                            if (node_map[n[d3][j]]) {
-                                n[d3][j] = node_map[n[d3][j]].id;
+                        nodeList = nodeList.map(function(id) {
+                            var node = node_map[id];
+                            if (node) {
+                                if (node._def.category === 'config') {
+                                    if (node.users.indexOf(n) === -1) {
+                                        node.users.push(n);
+                                    }
+                                }
+                                return node.id;
                             }
-                        }
-
+                            return id;
+                        })
+                        n[d3] = Array.isArray(n[d3])?nodeList:nodeList[0];
                     }
                 }
             }
@@ -1920,6 +2004,18 @@ RED.nodes = (function() {
         RED.events.emit("groups:remove",group);
     }
 
+    function getNodeHelp(type) {
+        var helpContent = "";
+        var helpElement = $("script[data-help-name='"+type+"']");
+        if (helpElement) {
+            helpContent = helpElement.html();
+            var helpType = helpElement.attr("type");
+            if (helpType === "text/markdown") {
+                helpContent = RED.utils.renderMarkdown(helpContent);
+            }
+        }
+        return helpContent;
+    }
 
     return {
         init: function() {
@@ -1999,6 +2095,7 @@ RED.nodes = (function() {
 
         registerType: registry.registerNodeType,
         getType: registry.getNodeType,
+        getNodeHelp: getNodeHelp,
         convertNode: convertNode,
 
         add: addNode,
diff --git a/packages/node_modules/@node-red/editor-client/src/js/plugins.js b/packages/node_modules/@node-red/editor-client/src/js/plugins.js
new file mode 100644
index 000000000..e6f41517d
--- /dev/null
+++ b/packages/node_modules/@node-red/editor-client/src/js/plugins.js
@@ -0,0 +1,46 @@
+RED.plugins = (function() {
+    var plugins = {};
+    var pluginsByType = {};
+
+    function registerPlugin(id,definition) {
+        plugins[id] = definition;
+        if (definition.type) {
+            pluginsByType[definition.type] = pluginsByType[definition.type] || [];
+            pluginsByType[definition.type].push(definition);
+        }
+        if (RED._loadingModule) {
+            definition.module = RED._loadingModule;
+            definition["_"] = function() {
+                var args = Array.prototype.slice.call(arguments);
+                var originalKey = args[0];
+                if (!/:/.test(args[0])) {
+                    args[0] = definition.module+":"+args[0];
+                }
+                var result = RED._.apply(null,args);
+                if (result === args[0]) {
+                    return originalKey;
+                }
+                return result;
+            }
+        } else {
+            definition["_"] = RED["_"]
+        }
+        if (definition.onadd && typeof definition.onadd === 'function') {
+            definition.onadd();
+        }
+        RED.events.emit("registry:plugin-added",id);
+    }
+
+    function getPlugin(id) {
+        return plugins[id]
+    }
+
+    function getPluginsByType(type) {
+        return pluginsByType[type] || [];
+    }
+    return {
+        registerPlugin: registerPlugin,
+        getPlugin: getPlugin,
+        getPluginsByType: getPluginsByType
+    }
+})();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/polyfills.js b/packages/node_modules/@node-red/editor-client/src/js/polyfills.js
index 0e7206f7a..100cd4913 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/polyfills.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/polyfills.js
@@ -52,6 +52,5 @@
             Set.prototype = _Set.prototype;
             Set.prototype.constructor = Set;
         }
-
     }
 })();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index ff8dad5bf..0b33855fe 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -15,19 +15,65 @@
  **/
 var RED = (function() {
 
-    function appendNodeConfig(nodeConfig,done) {
+
+    function loadPluginList() {
+        loader.reportProgress(RED._("event.loadPlugins"), 10)
+        $.ajax({
+            headers: {
+                "Accept":"application/json"
+            },
+            cache: false,
+            url: 'plugins',
+            success: function(data) {
+                loader.reportProgress(RED._("event.loadPlugins"), 13)
+                RED.i18n.loadPluginCatalogs(function() {
+                    loadPlugins(function() {
+                        loadNodeList();
+                    });
+                });
+            }
+        });
+    }
+    function loadPlugins(done) {
+        loader.reportProgress(RED._("event.loadPlugins",{count:""}), 17)
+        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
+
+        $.ajax({
+            headers: {
+                "Accept":"text/html",
+                "Accept-Language": lang
+            },
+            cache: false,
+            url: 'plugins',
+            success: function(data) {
+                var configs = data.trim().split(/(?=<!-- --- \[red-plugin:\S+\] --- -->)/);
+                var totalCount = configs.length;
+                var stepConfig = function() {
+                    // loader.reportProgress(RED._("event.loadNodes",{count:(totalCount-configs.length)+"/"+totalCount}), 30 + ((totalCount-configs.length)/totalCount)*40 )
+                    if (configs.length === 0) {
+                        done();
+                    } else {
+                        var config = configs.shift();
+                        appendPluginConfig(config,stepConfig);
+                    }
+                }
+                stepConfig();
+            }
+        });
+    }
+
+    function appendConfig(config, moduleIdMatch, targetContainer, done) {
         done = done || function(){};
-        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
         var moduleId;
-        if (m) {
-            moduleId = m[1];
+        if (moduleIdMatch) {
+            moduleId = moduleIdMatch[1];
+            RED._loadingModule = moduleId;
         } else {
             moduleId = "unknown";
         }
         try {
             var hasDeferred = false;
-
-            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
+            var nodeConfigEls = $("<div>"+config+"</div>");
             var scripts = nodeConfigEls.find("script");
             var scriptCount = scripts.length;
             scripts.each(function(i,el) {
@@ -38,14 +84,15 @@ var RED = (function() {
                     newScript.onload = function() {
                         scriptCount--;
                         if (scriptCount === 0) {
-                            $("#red-ui-editor-node-configs").append(nodeConfigEls);
+                            $(targetContainer).append(nodeConfigEls);
+                            delete RED._loadingModule;
                             done()
                         }
                     }
                     if ($(el).attr('type') === "module") {
                         newScript.type = "module";
                     }
-                    $("#red-ui-editor-node-configs").append(newScript);
+                    $(targetContainer).append(newScript);
                     newScript.src = RED.settings.apiRootUrl+srcUrl;
                     hasDeferred = true;
                 } else {
@@ -61,7 +108,8 @@ var RED = (function() {
                 }
             })
             if (!hasDeferred) {
-                $("#red-ui-editor-node-configs").append(nodeConfigEls);
+                $(targetContainer).append(nodeConfigEls);
+                delete RED._loadingModule;
                 done();
             }
         } catch(err) {
@@ -70,9 +118,27 @@ var RED = (function() {
                 timeout: 10000
             });
             console.log("["+moduleId+"] "+err.toString());
+            delete RED._loadingModule;
             done();
         }
     }
+    function appendPluginConfig(pluginConfig,done) {
+        appendConfig(
+            pluginConfig,
+            /<!-- --- \[red-plugin:(\S+)\] --- -->/.exec(pluginConfig.trim()),
+            "#red-ui-editor-plugin-configs",
+            done
+        );
+    }
+
+    function appendNodeConfig(nodeConfig,done) {
+        appendConfig(
+            nodeConfig,
+            /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim()),
+            "#red-ui-editor-node-configs",
+            done
+        );
+    }
 
     function loadNodeList() {
         loader.reportProgress(RED._("event.loadPalette"), 20)
@@ -186,6 +252,7 @@ var RED = (function() {
                             RED.workspaces.show(currentHash.substring(6));
                         }
                     } catch(err) {
+                        console.warn(err);
                         RED.notify(
                             RED._("event.importError", {message: err.message}),
                             {
@@ -269,7 +336,7 @@ var RED = (function() {
                                     }
                                 }
                             ]
-                            // } else if (RED.settings.theme('palette.editable') !== false) {
+                            // } else if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
                         } else {
                             options.buttons = [
                                 {
@@ -509,7 +576,7 @@ var RED = (function() {
         ]});
 
         menuOptions.push(null);
-        if (RED.settings.theme('palette.editable') !== false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
             menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:"core:manage-palette"});
             menuOptions.push(null);
         }
@@ -544,7 +611,7 @@ var RED = (function() {
         RED.palette.init();
         RED.eventLog.init();
 
-        if (RED.settings.theme('palette.editable') !== false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
             RED.palette.editor.init();
         } else {
             console.log("Palette editor disabled");
@@ -579,7 +646,7 @@ var RED = (function() {
 
         RED.actions.add("core:show-about", showAbout);
 
-        loadNodeList();
+        loadPluginList();
     }
 
 
@@ -595,6 +662,7 @@ var RED = (function() {
             '<div id="red-ui-sidebar"></div>'+
             '<div id="red-ui-sidebar-separator"></div>'+
         '</div>').appendTo(options.target);
+        $('<div id="red-ui-editor-plugin-configs"></div>').appendTo(options.target);
         $('<div id="red-ui-editor-node-configs"></div>').appendTo(options.target);
         $('<div id="red-ui-full-shade" class="hide"></div>').appendTo(options.target);
 
@@ -613,9 +681,12 @@ var RED = (function() {
                     $('<span>').html(theme.header.title).appendTo(logo);
                 }
             }
+            if (theme.themes) {
+                knownThemes = theme.themes;
+            }
         });
     }
-
+    var knownThemes = null;
     var initialised = false;
 
     function init(options) {
@@ -635,7 +706,13 @@ var RED = (function() {
         buildEditor(options);
 
         RED.i18n.init(options, function() {
-            RED.settings.init(options, loadEditor);
+            RED.settings.init(options, function() {
+                if (knownThemes) {
+                    RED.settings.editorTheme = RED.settings.editorTheme || {};
+                    RED.settings.editorTheme.themes = knownThemes;
+                }
+                loadEditor();
+            });
         })
     }
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/settings.js b/packages/node_modules/@node-red/editor-client/src/js/settings.js
index 760165581..109554418 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/settings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js
@@ -57,12 +57,11 @@ RED.settings = (function () {
             return JSON.parse(localStorage.getItem(key));
         } else {
             var v;
-            try {
-                v = RED.utils.getMessageProperty(userSettings,key);
-                if (v === undefined) {
-                    v = defaultIfUndefined;
-                }
-            } catch(err) {
+            try { v = RED.utils.getMessageProperty(userSettings,key); } catch(err) {}
+            if (v === undefined) {
+                try { v = RED.utils.getMessageProperty(RED.settings,key); } catch(err) {}
+            }
+            if (v === undefined) {
                 v = defaultIfUndefined;
             }
             return v;
diff --git 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
index e46c88b4f..bb82ecea3 100644
--- 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
@@ -30,6 +30,27 @@ RED.clipboard = (function() {
 
     var pendingImportConfig;
 
+
+    function downloadData(file, data) {
+        if (window.navigator.msSaveBlob) {
+            // IE11 workaround
+            // IE does not support data uri scheme for downloading data
+            var blob = new Blob([data], {
+                type: "data:text/plain;charset=utf-8"
+            });
+            navigator.msSaveBlob(blob, file);
+        }
+        else {
+            var element = document.createElement('a');
+            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(data));
+            element.setAttribute('download', file);
+            element.style.display = 'none';
+            document.body.appendChild(element);
+            element.click();
+            document.body.removeChild(element);
+        }
+    }
+
     function setupDialogs() {
         dialog = $('<div id="red-ui-clipboard-dialog" class="hide"><form class="dialog-form form-horizontal"></form></div>')
             .appendTo("#red-ui-editor")
@@ -56,13 +77,8 @@ RED.clipboard = (function() {
                         class: "primary",
                         text: RED._("clipboard.download"),
                         click: function() {
-                            var element = document.createElement('a');
-                            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent($("#red-ui-clipboard-dialog-export-text").val()));
-                            element.setAttribute('download', "flows.json");
-                            element.style.display = 'none';
-                            document.body.appendChild(element);
-                            element.click();
-                            document.body.removeChild(element);
+                            var data = $("#red-ui-clipboard-dialog-export-text").val();
+                            downloadData("flows.json", data);
                             $( this ).dialog( "close" );
                         }
                     },
@@ -72,9 +88,7 @@ RED.clipboard = (function() {
                         text: RED._("clipboard.export.copy"),
                         click: function() {
                             if (activeTab === "red-ui-clipboard-dialog-export-tab-clipboard") {
-                                $("#red-ui-clipboard-dialog-export-text").select();
-                                document.execCommand("copy");
-                                document.getSelection().removeAllRanges();
+                                copyText($("#red-ui-clipboard-dialog-export-text").val());
                                 RED.notify(RED._("clipboard.nodesExported"),{id:"clipboard"});
                                 $( this ).dialog( "close" );
                             } else {
@@ -222,14 +236,22 @@ RED.clipboard = (function() {
                 '</div>'+
                 '<div id="red-ui-clipboard-dialog-export-tabs-content" class="red-ui-clipboard-dialog-tabs-content">'+
                     '<div id="red-ui-clipboard-dialog-export-tab-clipboard" class="red-ui-clipboard-dialog-tab-clipboard">'+
-                        '<div class="form-row" style="height:calc(100% - 30px)">'+
-                            '<textarea readonly id="red-ui-clipboard-dialog-export-text"></textarea>'+
+                        '<div id="red-ui-clipboard-dialog-export-tab-clipboard-tab-bar">'+
+                            '<ul id="red-ui-clipboard-dialog-export-tab-clipboard-tabs"></ul>'+
                         '</div>'+
-                        '<div class="form-row" style="text-align: right;">'+
-                            '<span id="red-ui-clipboard-dialog-export-fmt-group" class="button-group">'+
-                                '<a id="red-ui-clipboard-dialog-export-fmt-mini" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
-                                '<a id="red-ui-clipboard-dialog-export-fmt-full" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
-                            '</span>'+
+                        '<div class="red-ui-clipboard-dialog-export-tab-clipboard-tab" id="red-ui-clipboard-dialog-export-tab-clipboard-preview">'+
+                            '<div id="red-ui-clipboard-dialog-export-tab-clipboard-preview-list"></div>'+
+                        '</div>'+
+                        '<div class="red-ui-clipboard-dialog-export-tab-clipboard-tab" id="red-ui-clipboard-dialog-export-tab-clipboard-json">'+
+                            '<div class="form-row" style="height:calc(100% - 40px)">'+
+                                '<textarea readonly id="red-ui-clipboard-dialog-export-text"></textarea>'+
+                            '</div>'+
+                            '<div class="form-row" style="text-align: right;">'+
+                                '<span id="red-ui-clipboard-dialog-export-fmt-group" class="button-group">'+
+                                    '<a id="red-ui-clipboard-dialog-export-fmt-mini" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
+                                    '<a id="red-ui-clipboard-dialog-export-fmt-full" class="red-ui-button red-ui-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
+                                '</span>'+
+                            '</div>'+
                         '</div>'+
                     '</div>'+
                     '<div id="red-ui-clipboard-dialog-export-tab-library" class="red-ui-clipboard-dialog-tab-library">'+
@@ -592,6 +614,30 @@ RED.clipboard = (function() {
         })
         loadFlowLibrary(libraryBrowser,"local",RED._("library.types.local"));
 
+        var clipboardTabs = RED.tabs.create({
+            id: "red-ui-clipboard-dialog-export-tab-clipboard-tabs",
+            onchange: function(tab) {
+                $(".red-ui-clipboard-dialog-export-tab-clipboard-tab").hide();
+                $("#" + tab.id).show();
+            }
+        });
+
+        clipboardTabs.addTab({
+            id: "red-ui-clipboard-dialog-export-tab-clipboard-preview",
+            label: RED._("clipboard.exportNodes")
+        });
+
+        clipboardTabs.addTab({
+            id: "red-ui-clipboard-dialog-export-tab-clipboard-json",
+            label: RED._("editor.types.json")
+        });
+
+
+        var previewList = $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").css({position:"absolute",top:0,right:0,bottom:0,left:0}).treeList({
+            data: []
+        })
+        refreshExportPreview();
+
         $("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();
 
         dialogContainer.i18n();
@@ -630,10 +676,10 @@ RED.clipboard = (function() {
             }
             $(this).parent().children().removeClass('selected');
             $(this).addClass('selected');
-            var type = $(this).attr('id');
+            var type = $(this).attr('id').substring("red-ui-clipboard-dialog-export-rng-".length);
             var flow = "";
             var nodes = null;
-            if (type === 'red-ui-clipboard-dialog-export-rng-selected') {
+            if (type === 'selected') {
                 var selection = RED.workspaces.selection();
                 if (selection.length > 0) {
                     nodes = [];
@@ -647,14 +693,14 @@ RED.clipboard = (function() {
                 }
                 // Don't include the subflow meta-port nodes in the exported selection
                 nodes = RED.nodes.createExportableNodeSet(nodes.filter(function(n) { return n.type !== 'subflow'}));
-            } else if (type === 'red-ui-clipboard-dialog-export-rng-flow') {
+            } else if (type === 'flow') {
                 var activeWorkspace = RED.workspaces.active();
                 nodes = RED.nodes.groups(activeWorkspace);
                 nodes = nodes.concat(RED.nodes.filterNodes({z:activeWorkspace}));
                 var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
                 nodes.unshift(parentNode);
                 nodes = RED.nodes.createExportableNodeSet(nodes);
-            } else if (type === 'red-ui-clipboard-dialog-export-rng-full') {
+            } else if (type === 'full') {
                 nodes = RED.nodes.createCompleteNodeSet(false);
             }
             if (nodes !== null) {
@@ -670,8 +716,10 @@ RED.clipboard = (function() {
                 $("#red-ui-clipboard-dialog-export").addClass('disabled');
             }
             $("#red-ui-clipboard-dialog-export-text").val(flow);
-            setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
-            $("#red-ui-clipboard-dialog-export-text").trigger("focus");
+            setTimeout(function() {
+                $("#red-ui-clipboard-dialog-export-text").scrollTop(0);
+                refreshExportPreview(type);
+            },50);
         })
 
         $("#red-ui-clipboard-dialog-ok").hide();
@@ -717,6 +765,93 @@ RED.clipboard = (function() {
 
     }
 
+    function refreshExportPreview(type) {
+
+        var flowData = $("#red-ui-clipboard-dialog-export-text").val() || "[]";
+        var flow = JSON.parse(flowData);
+        var flows = {};
+        var subflows = {};
+        var nodes = [];
+        var nodesByZ = {};
+
+        var treeFlows = [];
+        var treeSubflows = [];
+
+        flow.forEach(function(node) {
+            if (node.type === "tab") {
+                flows[node.id] = {
+                    element: getFlowLabel(node,false),
+                    deferBuild: type !== "flow",
+                    expanded: type === "flow",
+                    children: []
+                };
+                treeFlows.push(flows[node.id])
+            } else if (node.type === "subflow") {
+                subflows[node.id] = {
+                    element: getNodeLabel(node,false),
+                    deferBuild: true,
+                    children: []
+                };
+                treeSubflows.push(subflows[node.id])
+            } else {
+                nodes.push(node);
+            }
+        });
+
+        var globalNodes = [];
+        var parentlessNodes = [];
+
+        nodes.forEach(function(node) {
+            var treeNode = {
+                element: getNodeLabel(node, false, false)
+            };
+            if (node.z) {
+                if (!flows[node.z] && !subflows[node.z]) {
+                    parentlessNodes.push(treeNode)
+                } else if (flows[node.z]) {
+                    flows[node.z].children.push(treeNode)
+                } else if (subflows[node.z]) {
+                    subflows[node.z].children.push(treeNode)
+                }
+            } else {
+                globalNodes.push(treeNode);
+            }
+        });
+        var treeData = [];
+
+        if (parentlessNodes.length > 0) {
+            treeData = treeData.concat(parentlessNodes);
+        }
+        if (type === "flow") {
+            treeData = treeData.concat(treeFlows);
+        } else if (treeFlows.length > 0) {
+            treeData.push({
+                label: RED._("menu.label.flows"),
+                deferBuild: treeFlows.length > 20,
+                expanded: treeFlows.length <= 20,
+                children: treeFlows
+            })
+        }
+        if (treeSubflows.length > 0) {
+            treeData.push({
+                label: RED._("menu.label.subflows"),
+                deferBuild: treeSubflows.length > 10,
+                expanded: treeSubflows.length <= 10,
+                children: treeSubflows
+            })
+        }
+        if (globalNodes.length > 0) {
+            treeData.push({
+                label: RED._("sidebar.info.globalConfig"),
+                deferBuild: globalNodes.length > 10,
+                expanded: globalNodes.length <= 10,
+                children: globalNodes
+            })
+        }
+
+        $("#red-ui-clipboard-dialog-export-tab-clipboard-preview-list").treeList('data',treeData);
+    }
+
     function loadFlowLibrary(browser,library,label) {
         // if (includeExamples) {
         //     listing.push({
@@ -756,6 +891,7 @@ RED.clipboard = (function() {
     }
     function copyText(value,element,msg) {
         var truncated = false;
+        var currentFocus = document.activeElement;
         if (typeof value !== "string" ) {
             value = JSON.stringify(value, function(key,value) {
                 if (value !== null && typeof value === 'object') {
@@ -787,7 +923,7 @@ RED.clipboard = (function() {
         if (truncated) {
             msg += "_truncated";
         }
-        $("#red-ui-clipboard-hidden").val(value).select();
+        $("#red-ui-clipboard-hidden").val(value).focus().select();
         var result =  document.execCommand("copy");
         if (result && element) {
             var popover = RED.popover.create({
@@ -801,6 +937,10 @@ RED.clipboard = (function() {
             },1000);
             popover.open();
         }
+        $("#red-ui-clipboard-hidden").val("");
+        if (currentFocus) {
+            $(currentFocus).focus();
+        }
         return result;
     }
 
@@ -1103,7 +1243,7 @@ RED.clipboard = (function() {
         init: function() {
             setupDialogs();
 
-            $('<input type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo("#red-ui-editor");
+            $('<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);
diff --git 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
index fa1e68cca..332f41fa9 100644
--- 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
@@ -965,6 +965,18 @@
         },
         hide: function() {
             this.uiSelect.hide();
+        },
+        disable: function(val) {
+            if(val === true) {
+                this.uiSelect.attr("disabled", "disabled");
+            } else if (val === false) {
+                this.uiSelect.attr("disabled", null); //remove attr
+            } else {
+                this.uiSelect.attr("disabled", val); //user value
+            }
+        },
+        disabled: function() {
+            return this.uiSelect.attr("disabled");
         }
     });
 })(jQuery);
diff --git 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
index 4488f86c0..82a81da95 100644
--- 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
@@ -414,18 +414,20 @@ RED.editor = (function() {
         for (var cred in credDefinition) {
             if (credDefinition.hasOwnProperty(cred)) {
                 var input = $("#" + prefix + '-' + cred);
-                var value = input.val();
-                if (credDefinition[cred].type == 'password') {
-                    node.credentials['has_' + cred] = (value !== "");
-                    if (value == '__PWRD__') {
-                        continue;
-                    }
-                    changed = true;
+                if (input.length > 0) {
+                    var value = input.val();
+                    if (credDefinition[cred].type == 'password') {
+                        node.credentials['has_' + cred] = (value !== "");
+                        if (value == '__PWRD__') {
+                            continue;
+                        }
+                        changed = true;
 
-                }
-                node.credentials[cred] = value;
-                if (value != node.credentials._[cred]) {
-                    changed = true;
+                    }
+                    node.credentials[cred] = value;
+                    if (value != node.credentials._[cred]) {
+                        changed = true;
+                    }
                 }
             }
         }
@@ -442,16 +444,18 @@ RED.editor = (function() {
         for (var d in definition.defaults) {
             if (definition.defaults.hasOwnProperty(d)) {
                 if (definition.defaults[d].type) {
-                    var configTypeDef = RED.nodes.getType(definition.defaults[d].type);
-                    if (configTypeDef) {
-                        if (configTypeDef.exclusive) {
-                            prepareConfigNodeButton(node,d,definition.defaults[d].type,prefix);
+                    if (!definition.defaults[d]._type.array) {
+                        var configTypeDef = RED.nodes.getType(definition.defaults[d].type);
+                        if (configTypeDef && configTypeDef.category === 'config') {
+                            if (configTypeDef.exclusive) {
+                                prepareConfigNodeButton(node,d,definition.defaults[d].type,prefix);
+                            } else {
+                                prepareConfigNodeSelect(node,d,definition.defaults[d].type,prefix);
+                            }
                         } else {
-                            prepareConfigNodeSelect(node,d,definition.defaults[d].type,prefix);
+                            console.log("Unknown type:", definition.defaults[d].type);
+                            preparePropertyEditor(node,d,prefix,definition.defaults);
                         }
-                    } else {
-                        console.log("Unknown type:", definition.defaults[d].type);
-                        preparePropertyEditor(node,d,prefix,definition.defaults);
                     }
                 } else {
                     preparePropertyEditor(node,d,prefix,definition.defaults);
@@ -465,6 +469,7 @@ RED.editor = (function() {
                     definition.oneditprepare.call(node);
                 } catch(err) {
                     console.log("oneditprepare",node.id,node.type,err.toString());
+                    console.log(err.stack);
                 }
             }
             // Now invoke any change handlers added to the fields - passing true
@@ -491,11 +496,13 @@ RED.editor = (function() {
                 populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
                 completePrepare();
             } else {
-                $.getJSON(getCredentialsURL(node.type, node.id), function (data) {
-                    node.credentials = data;
-                    node.credentials._ = $.extend(true,{},data);
-                    if (!/^subflow:/.test(definition.type)) {
-                        populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                getNodeCredentials(node.type, node.id, function(data) {
+                    if (data) {
+                        node.credentials = data;
+                        node.credentials._ = $.extend(true,{},data);
+                        if (!/^subflow:/.test(definition.type)) {
+                            populateCredentialsInputs(node, definition.credentials, node.credentials, prefix);
+                        }
                     }
                     completePrepare();
                 });
@@ -1083,8 +1090,11 @@ RED.editor = (function() {
         node.infoEditor = nodeInfoEditor;
         return nodeInfoEditor;
     }
+var buildingEditDialog = false;
 
     function showEditDialog(node, defaultTab) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
         var editing_node = node;
         var isDefaultIcon;
         var defaultIcon;
@@ -1192,7 +1202,7 @@ RED.editor = (function() {
                                     changed = true;
                                 }
                             } catch(err) {
-                                console.log("oneditsave",editing_node.id,editing_node.type,err.toString());
+                                console.warn("oneditsave",editing_node.id,editing_node.type,err.toString());
                             }
 
                             for (d in editing_node._def.defaults) {
@@ -1609,6 +1619,7 @@ RED.editor = (function() {
                     if (defaultTab) {
                         editorTabs.activateTab(defaultTab);
                     }
+                    buildingEditDialog = false;
                     done();
                 });
             },
@@ -1660,6 +1671,8 @@ RED.editor = (function() {
      * prefix - the input prefix of the parent property
      */
     function showEditConfigNodeDialog(name,type,id,prefix) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
         var adding = (id == "_ADD_");
         var node_def = RED.nodes.getType(type);
         var editing_config_node = RED.nodes.node(id);
@@ -1823,6 +1836,7 @@ RED.editor = (function() {
                     trayBody.i18n();
                     trayFooter.i18n();
                     finishedBuilding = true;
+                    buildingEditDialog = false;
                     done();
                 });
             },
@@ -1890,7 +1904,7 @@ RED.editor = (function() {
                         try {
                             configTypeDef.oneditsave.call(editing_config_node);
                         } catch(err) {
-                            console.log("oneditsave",editing_config_node.id,editing_config_node.type,err.toString());
+                            console.warn("oneditsave",editing_config_node.id,editing_config_node.type,err.toString());
                         }
                     }
 
@@ -2146,6 +2160,8 @@ RED.editor = (function() {
     }
 
     function showEditSubflowDialog(subflow) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
         var editing_node = subflow;
         editStack.push(subflow);
         RED.view.state(RED.state.EDITING);
@@ -2250,6 +2266,14 @@ RED.editor = (function() {
                             changed = true;
                         }
 
+                        var newMeta = RED.subflow.exportSubflowModuleProperties(editing_node);
+
+                        if (!isSameObj(editing_node.meta,newMeta)) {
+                            changes.meta = editing_node.meta;
+                            editing_node.meta = newMeta;
+                            changed = true;
+                        }
+
                         if (changed) {
                             var wasChanged = editing_node.changed;
                             editing_node.changed = true;
@@ -2356,6 +2380,16 @@ RED.editor = (function() {
                 };
                 editorTabs.addTab(nodePropertiesTab);
 
+                var moduleTab = {
+                    id: "editor-tab-module",
+                    label: RED._("editor-tab.module"),
+                    name: RED._("editor-tab.module"),
+                    content: $('<div>', {class:"red-ui-tray-content"}).appendTo(editorContent).hide(),
+                    iconClass: "fa fa-cube",
+                };
+                editorTabs.addTab(moduleTab);
+                RED.subflow.buildModuleForm(moduleTab.content, editing_node);
+
                 var descriptionTab = {
                     id: "editor-tab-description",
                     label: RED._("editor-tab.description"),
@@ -2384,15 +2418,17 @@ RED.editor = (function() {
 
                 buildEditForm(nodePropertiesTab.content,"dialog-form","subflow-template", undefined, editing_node);
                 trayBody.i18n();
-
-                $.getJSON(getCredentialsURL("subflow", subflow.id), function (data) {
-                    subflow.credentials = data;
-                    subflow.credentials._ = $.extend(true,{},data);
-
+                getNodeCredentials("subflow", subflow.id, function(data) {
+                    if (data) {
+                        subflow.credentials = data;
+                        subflow.credentials._ = $.extend(true,{},data);
+                    }
                     $("#subflow-input-name").val(subflow.name);
                     RED.text.bidi.prepareInput($("#subflow-input-name"));
 
                     finishedBuilding = true;
+                    buildingEditDialog = false;
+
                     done();
                 });
             },
@@ -2413,7 +2449,39 @@ RED.editor = (function() {
         RED.tray.show(trayOptions);
     }
 
+    function getNodeCredentials(type, id, done) {
+        var timeoutNotification;
+        var intialTimeout = setTimeout(function() {
+            timeoutNotification = RED.notify($('<p data-i18n="[prepend]editor.loadCredentials">  <img src="red/images/spin.svg"/></p>').i18n(),{fixed: true})
+        },800);
+
+        $.ajax({
+            url: getCredentialsURL(type,id),
+            dataType: 'json',
+            success: function(data) {
+                if (timeoutNotification) {
+                    timeoutNotification.close();
+                    timeoutNotification = null;
+                }
+                clearTimeout(intialTimeout);
+                done(data);
+            },
+            error: function(jqXHR,status,error) {
+                if (timeoutNotification) {
+                    timeoutNotification.close();
+                    timeoutNotification = null;
+                }
+                clearTimeout(intialTimeout);
+                RED.notify(RED._("editor.errors.credentialLoadFailed"),"error")
+                done(null);
+            },
+            timeout: 30000,
+        });
+    }
+
     function showEditGroupDialog(group) {
+        if (buildingEditDialog) { return }
+        buildingEditDialog = true;
         var editing_node = group;
         editStack.push(group);
         RED.view.state(RED.state.EDITING);
@@ -2457,7 +2525,7 @@ RED.editor = (function() {
                                     changed = true;
                                 }
                             } catch(err) {
-                                console.log("oneditsave",editing_node.id,editing_node.type,err.toString());
+                                console.warn("oneditsave",editing_node.id,editing_node.type,err.toString());
                             }
 
                             for (d in editing_node._def.defaults) {
@@ -2637,6 +2705,7 @@ RED.editor = (function() {
                 prepareEditDialog(group,group._def,"node-input", function() {
                     trayBody.i18n();
                     finishedBuilding = true;
+                    buildingEditDialog = false;
                     done();
                 });
             },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
index b0aeed0fe..3ff3e7436 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -329,21 +329,26 @@ RED.palette.editor = (function() {
         catalogueLoadStatus.push(err||v);
         if (!err) {
             if (v.modules) {
-                v.modules.forEach(function(m) {
-                    loadedIndex[m.id] = m;
-                    m.index = [m.id];
-                    if (m.keywords) {
-                        m.index = m.index.concat(m.keywords);
+                var a = false;
+                v.modules = v.modules.filter(function(m) {
+                    if (checkModuleAllowed(m.id,m.version,installAllowList,installDenyList)) {
+                        loadedIndex[m.id] = m;
+                        m.index = [m.id];
+                        if (m.keywords) {
+                            m.index = m.index.concat(m.keywords);
+                        }
+                        if (m.types) {
+                            m.index = m.index.concat(m.types);
+                        }
+                        if (m.updated_at) {
+                            m.timestamp = new Date(m.updated_at).getTime();
+                        } else {
+                            m.timestamp = 0;
+                        }
+                        m.index = m.index.join(",").toLowerCase();
+                        return true;
                     }
-                    if (m.types) {
-                        m.index = m.index.concat(m.types);
-                    }
-                    if (m.updated_at) {
-                        m.timestamp = new Date(m.updated_at).getTime();
-                    } else {
-                        m.timestamp = 0;
-                    }
-                    m.index = m.index.join(",").toLowerCase();
+                    return false;
                 })
                 loadedList = loadedList.concat(v.modules);
             }
@@ -437,11 +442,84 @@ RED.palette.editor = (function() {
         return -1 * (A.info.timestamp-B.info.timestamp);
     }
 
+    var installAllowList = ['*'];
+    var installDenyList = [];
+
+    function parseModuleList(list) {
+        list = list || ["*"];
+        return list.map(function(rule) {
+            var m = /^(.+?)(?:@(.*))?$/.exec(rule);
+            var wildcardPos = m[1].indexOf("*");
+            wildcardPos = wildcardPos===-1?Infinity:wildcardPos;
+
+            return {
+                module: new RegExp("^"+m[1].replace(/\*/g,".*")+"$"),
+                version: m[2],
+                wildcardPos: wildcardPos
+            }
+        })
+    }
+
+    function checkAgainstList(module,version,list) {
+        for (var i=0;i<list.length;i++) {
+            var rule = list[i];
+            if (rule.module.test(module)) {
+                // Without a full semver library in the editor,
+                // we skip the version check.
+                // Not ideal - but will get caught in the runtime
+                // if the user tries to install.
+                return rule;
+            }
+        }
+    }
+
+    function checkModuleAllowed(module,version,allowList,denyList) {
+        if (!allowList && !denyList) {
+            // Default to allow
+            return true;
+        }
+        if (allowList.length === 0 && denyList.length === 0) {
+            return true;
+        }
+
+        var allowedRule = checkAgainstList(module,version,allowList);
+        var deniedRule = checkAgainstList(module,version,denyList);
+        // console.log("A",allowedRule)
+        // console.log("D",deniedRule)
+
+        if (allowedRule && !deniedRule) {
+            return true;
+        }
+        if (!allowedRule && deniedRule) {
+            return false;
+        }
+        if (!allowedRule && !deniedRule) {
+            return true;
+        }
+        if (allowedRule.wildcardPos !== deniedRule.wildcardPos) {
+            return allowedRule.wildcardPos > deniedRule.wildcardPos
+        } else {
+            // First wildcard in same position.
+            // Go with the longer matching rule. This isn't going to be 100%
+            // right, but we are deep into edge cases at this point.
+            return allowedRule.module.toString().length > deniedRule.module.toString().length
+        }
+        return false;
+    }
 
     function init() {
-        if (RED.settings.theme('palette.editable') === false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
             return;
         }
+        var settingsAllowList = RED.settings.get("externalModules.palette.allowList")
+        var settingsDenyList = RED.settings.get("externalModules.palette.denyList")
+        if (settingsAllowList || settingsDenyList) {
+            installAllowList = settingsAllowList;
+            installDenyList = settingsDenyList
+        }
+        installAllowList = parseModuleList(installAllowList);
+        installDenyList = parseModuleList(installDenyList);
+
         createSettingsPane();
 
         RED.userSettings.add({
@@ -880,7 +958,7 @@ RED.palette.editor = (function() {
             }
         });
 
-        if (RED.settings.theme('palette.upload') !== false) {
+        if (RED.settings.get('externalModules.palette.allowUpload', true) !== false) {
             var uploadSpan = $('<span class="button-group">').prependTo(toolBar);
             var uploadButton = $('<button type="button" class="red-ui-sidebar-header-button red-ui-palette-editor-upload-button"><label><i class="fa fa-upload"></i><form id="red-ui-palette-editor-upload-form" enctype="multipart/form-data"><input name="tarball" type="file" accept=".tgz"></label></button>').appendTo(uploadSpan);
 
@@ -962,7 +1040,7 @@ RED.palette.editor = (function() {
     }
 
     function update(entry,version,url,container,done) {
-        if (RED.settings.theme('palette.editable') === false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
             done(new Error('Palette not editable'));
             return;
         }
@@ -1021,7 +1099,7 @@ RED.palette.editor = (function() {
         })
     }
     function remove(entry,container,done) {
-        if (RED.settings.theme('palette.editable') === false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
             done(new Error('Palette not editable'));
             return;
         }
@@ -1078,7 +1156,7 @@ RED.palette.editor = (function() {
         })
     }
     function install(entry,container,done) {
-        if (RED.settings.theme('palette.editable') === false) {
+        if (RED.settings.get('externalModules.palette.allowInstall', true) === false) {
             done(new Error('Palette not editable'));
             return;
         }
diff --git 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
index ecee89d70..0cb202051 100755
--- 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
@@ -97,13 +97,18 @@ RED.palette = (function() {
         label = RED.utils.sanitize(label);
 
 
-        var words = label.split(/[ -]/);
+        var words = label.split(/([ -]|\\n )/);
 
         var displayLines = [];
 
         var currentLine = "";
         for (var i=0;i<words.length;i++) {
             var word = words[i];
+            if (word === "\\n ") {
+                displayLines.push(currentLine);
+                currentLine = "";
+                continue;
+            }
             var sep = (i == 0) ? "" : " ";
             var newWidth = RED.view.calculateTextWidth(currentLine+sep+word, "red-ui-palette-label");
             if (newWidth < nodeWidth) {
@@ -147,7 +152,7 @@ RED.palette = (function() {
         var popOverContent;
         try {
             var l = "<p><b>"+RED.text.bidi.enforceTextDirectionWithUCC(label)+"</b></p>";
-            popOverContent = $('<div></div>').append($(l+(info?info:$("script[data-help-name='"+type+"']").html()||"<p>"+RED._("palette.noInfo")+"</p>").trim())
+            popOverContent = $('<div></div>').append($(l+(info?info:RED.nodes.getNodeHelp(type)||"<p>"+RED._("palette.noInfo")+"</p>").trim())
                                 .filter(function(n) {
                                     return (this.nodeType == 1 && this.nodeName == "P") || (this.nodeType == 3 && this.textContent.trim().length > 0)
                                 }).slice(0,2));
@@ -165,7 +170,16 @@ RED.palette = (function() {
                     metaData = typeInfo.set.module+" : ";
                 }
                 metaData += type;
-                $('<button type="button" onclick="RED.sidebar.help.show(\''+type+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
+
+                if (/^subflow:/.test(type)) {
+                    $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
+                }
+
+                var safeType = type.replace(/'/g,"\\'");
+
+                $('<button type="button" onclick="RED.search.show(\'type:'+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
+                $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
+
                 $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
             }
         } catch(err) {
@@ -264,27 +278,6 @@ RED.palette = (function() {
 
             d.data('popover',popover);
 
-            // $(d).popover({
-            //     title:d.type,
-            //     placement:"right",
-            //     trigger: "hover",
-            //     delay: { show: 750, hide: 50 },
-            //     html: true,
-            //     container:'body'
-            // });
-            // d.on("click", function() {
-            //     RED.view.focus();
-            //     var helpText;
-            //     if (nt.indexOf("subflow:") === 0) {
-            //         helpText = RED.utils.renderMarkdown(RED.nodes.subflow(nt.substring(8)).info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-            //     } else {
-            //         helpText = $("script[data-help-name='"+d.attr("data-palette-type")+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-            //     }
-            //     // Don't look too closely. RED.sidebar.info.set will set the 'Description'
-            //     // section of the sidebar. Pass in the title of the Help section so it looks
-            //     // right.
-            //     RED.sidebar.type.show(helpText,RED._("sidebar.info.nodeHelp"));
-            // });
             var chart = $("#red-ui-workspace-chart");
             var chartSVG = $("#red-ui-workspace-chart>svg").get(0);
             var activeSpliceLink;
@@ -417,7 +410,8 @@ RED.palette = (function() {
                     RED.workspaces.show(nt.substring(8));
                     e.preventDefault();
                 });
-                nodeInfo = RED.utils.renderMarkdown(def.info||"");
+                var subflow = RED.nodes.subflow(nt.substring(8));
+                nodeInfo = RED.utils.renderMarkdown(subflow.info||"");
             }
             setLabel(nt,d,label,nodeInfo);
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
index fdd106e23..c39ac97be 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
@@ -465,7 +465,7 @@ RED.projects.settings = (function() {
                     metaRow = $('<div class="red-ui-palette-module-meta"></div>').appendTo(headerRow);
                     var buttons = $('<div class="red-ui-palette-module-button-group"></div>').appendTo(metaRow);
                     if (RED.user.hasPermission("projects.write")) {
-                        if (!entry.installed && RED.settings.theme('palette.editable') !== false) {
+                        if (!entry.installed && RED.settings.get('externalModules.palette.allowInstall', true) !== false) {
                             $('<a href="#" class="red-ui-button red-ui-button-small">' + RED._("sidebar.project.projectSettings.install") + '</a>').appendTo(buttons)
                                 .on("click", function(evt) {
                                     evt.preventDefault();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js
index 31acbc1e4..7ca13a3cf 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js
@@ -43,9 +43,11 @@ RED.projects.userSettings = (function() {
 
     function createWorkflowSection(pane) {
 
+        var defaultWorkflowMode = RED.settings.theme("projects.workflow.mode","manual");
+
         var currentGitSettings = RED.settings.get('git') || {};
         currentGitSettings.workflow = currentGitSettings.workflow || {};
-        currentGitSettings.workflow.mode = currentGitSettings.workflow.mode || "manual";
+        currentGitSettings.workflow.mode = currentGitSettings.workflow.mode || defaultWorkflowMode;
 
         var title = $('<h3></h3>').text(RED._("editor:sidebar.project.userSettings.workflow")).appendTo(pane);
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
index 8aede9c2b..5512926be 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js
@@ -294,7 +294,10 @@ RED.sidebar.versionControl = (function() {
                 // TODO: this is a full refresh of the files - should be able to
                 //       just do an incremental refresh
 
-                var workflowMode = ((RED.settings.get('git') || {}).workflow || {}).mode || "manual";
+                // Get the default workflow mode from theme settings
+                var defaultWorkflowMode = RED.settings.theme("projects.workflow.mode","manual");
+                // Check for the user-defined choice of mode
+                var workflowMode = ((RED.settings.get('git') || {}).workflow || {}).mode || defaultWorkflowMode;
                 if (workflowMode === 'auto') {
                     refresh(true);
                 } else {
diff --git 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
index e89f3c235..b0a93630a 100644
--- 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
@@ -47,6 +47,37 @@ RED.subflow = (function() {
         '</div>'+
         '</script>';
 
+    var _subflowModulePaneTemplate = '<form class="dialog-form form-horizontal" autocomplete="off">'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-module" data-i18n="[append]editor:subflow.module"><i class="fa fa-cube"></i> </label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-module" data-i18n="[placeholder]common.label.name">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-type" data-i18n="[append]editor:subflow.type"> </label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-type">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-version" data-i18n="[append]editor:subflow.version"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-version" data-i18n="[placeholder]editor:subflow.versionPlaceholder">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-desc" data-i18n="[append]editor:subflow.desc"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-desc">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-license" data-i18n="[append]editor:subflow.license"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-license">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-author" data-i18n="[append]editor:subflow.author"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-author" data-i18n="[placeholder]editor:subflow.authorPlaceholder">'+
+        '</div>'+
+        '<div class="form-row">'+
+            '<label for="subflow-input-module-keywords" data-i18n="[append]editor:subflow.keys"></label>'+
+            '<input style="width: calc(100% - 110px)" type="text" id="subflow-input-module-keywords" data-i18n="[placeholder]editor:subflow.keysPlaceholder">'+
+        '</div>'+
+    '</form>';
+
     function findAvailableSubflowIOPosition(subflow,isInput) {
         var pos = {x:50,y:30};
         if (!isInput) {
@@ -433,12 +464,43 @@ RED.subflow = (function() {
 
         $("#red-ui-subflow-delete").on("click", function(event) {
             event.preventDefault();
-            var startDirty = RED.nodes.dirty();
-            var historyEvent = removeSubflow(RED.workspaces.active());
-            historyEvent.t = 'delete';
-            historyEvent.dirty = startDirty;
+            var subflow = RED.nodes.subflow(RED.workspaces.active());
+            if (subflow.instances.length > 0) {
+                var msg = $('<div>')
+                $('<p>').text(RED._("subflow.subflowInstances",{count: subflow.instances.length})).appendTo(msg);
+                $('<p>').text(RED._("subflow.confirmDelete")).appendTo(msg);
+                var confirmDeleteNotification = RED.notify(msg, {
+                    modal: true,
+                    fixed: true,
+                    buttons: [
+                        {
+                            text: RED._('common.label.cancel'),
+                            click: function() {
+                                confirmDeleteNotification.close();
+                            }
+                        },
+                        {
+                            text: RED._('workspace.confirmDelete'),
+                            class: "primary",
+                            click: function() {
+                                confirmDeleteNotification.close();
+                                completeDelete();
+                            }
+                        }
+                    ]
+                });
 
-            RED.history.push(historyEvent);
+                return;
+            } else {
+                completeDelete();
+            }
+            function completeDelete() {
+                var startDirty = RED.nodes.dirty();
+                var historyEvent = removeSubflow(RED.workspaces.active());
+                historyEvent.t = 'delete';
+                historyEvent.dirty = startDirty;
+                RED.history.push(historyEvent);
+            }
 
         });
 
@@ -993,6 +1055,7 @@ RED.subflow = (function() {
                                 icon: "",
                                 type: "cred"
                             }
+                            opt.ui.type = "cred";
                         } else {
                             opt.ui = opt.ui || {
                                 icon: "",
@@ -1488,6 +1551,7 @@ RED.subflow = (function() {
         var locale = RED.i18n.lang();
         var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, locale);
         var label = $('<label>').appendTo(row);
+        $('<span>&nbsp;</span>').appendTo(row);
         var labelContainer = $('<span></span>').appendTo(label);
         if (ui.icon) {
             var newPath = RED.utils.separateIconPath(ui.icon);
@@ -1723,22 +1787,54 @@ RED.subflow = (function() {
                     parentEnv[env.name] = item;
                 })
             }
-        }
-
-        if (node.env) {
-            for (var i = 0; i < node.env.length; i++) {
-                var env = node.env[i];
-                if (parentEnv.hasOwnProperty(env.name)) {
-                    parentEnv[env.name].type = env.type;
-                    parentEnv[env.name].value = env.value;
-                } else {
-                    // envList.push({
-                    //     name: env.name,
-                    //     type: env.type,
-                    //     value: env.value,
-                    // });
+            if (node.env) {
+                for (var i = 0; i < node.env.length; i++) {
+                    var env = node.env[i];
+                    if (parentEnv.hasOwnProperty(env.name)) {
+                        parentEnv[env.name].type = env.type;
+                        parentEnv[env.name].value = env.value;
+                    } else {
+                        // envList.push({
+                        //     name: env.name,
+                        //     type: env.type,
+                        //     value: env.value,
+                        // });
+                    }
                 }
             }
+        } else if (node._def.subflowModule) {
+            var keys = Object.keys(node._def.defaults);
+            keys.forEach(function(name) {
+                if (name !== 'name') {
+                    var prop = node._def.defaults[name];
+                    var nodeProp = node[name];
+                    var nodePropType;
+                    var nodePropValue = nodeProp;
+                    if (prop.ui && prop.ui.type === "cred") {
+                        nodePropType = "cred";
+                    } else {
+                        switch(typeof nodeProp) {
+                            case "string": nodePropType = "str"; break;
+                            case "number": nodePropType = "num"; break;
+                            case "boolean": nodePropType = "bool"; nodePropValue = nodeProp?"true":"false"; break;
+                            default:
+                            nodePropType = nodeProp.type;
+                            nodePropValue = nodeProp.value;
+                        }
+                    }
+                    var item = {
+                        name: name,
+                        type: nodePropType,
+                        value: nodePropValue,
+                        parent: {
+                            type: prop.type,
+                            value: prop.value
+                        },
+                        ui: $.extend(true,{},prop.ui)
+                    }
+                    envList.push(item);
+                }
+            })
         }
         return envList;
     }
@@ -1859,6 +1955,126 @@ RED.subflow = (function() {
         buildPropertiesList(list, node);
     }
 
+    function setupInputValidation(input,validator) {
+        var errorTip;
+        var validateTimeout;
+
+        var validateFunction = function() {
+            if (validateTimeout) {
+                return;
+            }
+            validateTimeout = setTimeout(function() {
+                var error = validator(input.val());
+                // if (!error && errorTip) {
+                //     errorTip.close();
+                //     errorTip = null;
+                // } else if (error && !errorTip) {
+                //     errorTip = RED.popover.create({
+                //         tooltip: true,
+                //         target:input,
+                //         size: "small",
+                //         direction: "bottom",
+                //         content: error,
+                //     }).open();
+                // }
+                input.toggleClass("input-error",!!error);
+                validateTimeout = null;
+            })
+        }
+        input.on("change keyup paste", validateFunction);
+    }
+
+    function buildModuleForm(container, node) {
+        $(_subflowModulePaneTemplate).appendTo(container);
+        var moduleProps = node.meta || {};
+        [
+            'module',
+            'type',
+            'version',
+            'author',
+            'desc',
+            'keywords',
+            'license'
+        ].forEach(function(property) {
+            $("#subflow-input-module-"+property).val(moduleProps[property]||"")
+        })
+        $("#subflow-input-module-type").attr("placeholder",node.id);
+
+        setupInputValidation($("#subflow-input-module-module"), function(newValue) {
+            newValue = newValue.trim();
+            var isValid = newValue.length < 215;
+            isValid = isValid && !/^[._]/.test(newValue);
+            isValid = isValid && !/[A-Z]/.test(newValue);
+            if (newValue !== encodeURIComponent(newValue)) {
+                var m = /^@([^\/]+)\/([^\/]+)$/.exec(newValue);
+                if (m) {
+                    isValid = isValid && (m[1] === encodeURIComponent(m[1]) && m[2] === encodeURIComponent(m[2]))
+                } else {
+                    isValid = false;
+                }
+            }
+            return isValid?"":"Invalid module name"
+        })
+        setupInputValidation($("#subflow-input-module-version"), function(newValue) {
+            newValue = newValue.trim();
+            var isValid = newValue === "" ||
+                          /^(\d|[1-9]\d*)\.(\d|[1-9]\d*)\.(\d|[1-9]\d*)(-(0|[1-9A-Za-z-][0-9A-Za-z-]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9A-Za-z-][0-9A-Za-z-]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/.test(newValue);
+            return isValid?"":"Invalid version number"
+        })
+
+        var licenses = ["none", "Apache-2.0", "BSD-3-Clause", "BSD-2-Clause", "GPL-2.0", "GPL-3.0", "MIT", "MPL-2.0", "CDDL-1.0", "EPL-2.0"];
+        var typedLicenses = {
+            types: licenses.map(function(l) {
+                return {
+                    value: l,
+                    label: l === "none" ? RED._("editor:subflow.licenseNone") : l,
+                    hasValue: false
+                };
+            })
+        }
+        typedLicenses.types.push({
+            value:"_custom_", label:RED._("editor:subflow.licenseOther"), icon:"red/images/typedInput/az.svg"
+        })
+        if (!moduleProps.license) {
+            typedLicenses.default = "none";
+        } else if (licenses.indexOf(moduleProps.license) > -1) {
+            typedLicenses.default = moduleProps.license;
+        } else {
+            typedLicenses.default = "_custom_";
+        }
+        $("#subflow-input-module-license").typedInput(typedLicenses)
+    }
+
+    function exportSubflowModuleProperties(node) {
+        var value;
+        var moduleProps = {};
+        [
+            'module',
+            'type',
+            'version',
+            'author',
+            'desc',
+            'keywords'
+        ].forEach(function(property) {
+            value = $("#subflow-input-module-"+property).val().trim();
+            if (value) {
+                moduleProps[property] = value;
+            }
+        })
+        var selectedLicenseType = $("#subflow-input-module-license").typedInput("type");
+
+        if (selectedLicenseType === '_custom_') {
+            value = $("#subflow-input-module-license").val();
+            if (value) {
+                moduleProps.license = value;
+            }
+        } else if (selectedLicenseType !== "none") {
+            moduleProps.license = selectedLicenseType;
+        }
+        return moduleProps;
+    }
+
+
     return {
         init: init,
         createSubflow: createSubflow,
@@ -1872,9 +2088,11 @@ RED.subflow = (function() {
 
         buildEditForm: buildEditForm,
         buildPropertiesForm: buildPropertiesForm,
+        buildModuleForm: buildModuleForm,
 
         exportSubflowTemplateEnv: exportEnvList,
-        exportSubflowInstanceEnv: exportSubflowInstanceEnv
+        exportSubflowInstanceEnv: exportSubflowInstanceEnv,
+        exportSubflowModuleProperties: exportSubflowModuleProperties
 
     }
 })();
diff --git 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
index c1344e755..cc86de358 100644
--- 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
@@ -247,7 +247,7 @@ RED.sidebar.help = (function() {
             helpText = (RED.utils.renderMarkdown(subflowNode.info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>'));
             title = subflowNode.name || nodeType;
         } else {
-            helpText = $("script[data-help-name='"+nodeType+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
+            helpText = RED.nodes.getNodeHelp(nodeType)||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
             title = nodeType;
         }
         setInfoText(title, helpText, helpSection);
diff --git 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
index f0c6e631a..891f9f7dc 100644
--- 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
@@ -119,34 +119,17 @@ RED.sidebar.info.outliner = (function() {
         return div;
     }
 
-    function getSubflowLabel(n) {
-
-        var div = $('<div>',{class:"red-ui-info-outline-item"});
-        RED.utils.createNodeIcon(n).appendTo(div);
-        var contentDiv = $('<div>',{class:"red-ui-search-result-description"}).appendTo(div);
-        var labelText = getNodeLabelText(n);
-        var label = $('<div>',{class:"red-ui-search-result-node-label red-ui-info-outline-item-label"}).appendTo(contentDiv);
-        if (labelText) {
-            label.text(labelText)
-        } else {
-            label.html("&nbsp;")
-        }
-
-        addControls(n, div);
-
-        return div;
-
-
-        // var div = $('<div>',{class:"red-ui-info-outline-item red-ui-info-outline-item-flow"});
-        // var contentDiv = $('<div>',{class:"red-ui-search-result-description red-ui-info-outline-item-label"}).appendTo(div);
-        // contentDiv.text(n.name || n.id);
-        // addControls(n, div);
-        // return div;
-    }
-
     function addControls(n,div) {
         var controls = $('<div>',{class:"red-ui-info-outline-item-controls red-ui-info-outline-item-hover-controls"}).appendTo(div);
 
+        if (n.type === "subflow") {
+            var subflowInstanceBadge = $('<button type="button" class="red-ui-info-outline-item-control-users red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').text(n.instances.length).appendTo(controls).on("click",function(evt) {
+                evt.preventDefault();
+                evt.stopPropagation();
+                RED.search.show("type:subflow:"+n.id);
+            })
+            // RED.popover.tooltip(userCountBadge,function() { return RED._('editor.nodesUse',{count:n.users.length})});
+        }
         if (n._def.category === "config" && n.type !== "group") {
             var userCountBadge = $('<button type="button" class="red-ui-info-outline-item-control-users red-ui-button red-ui-button-small"><i class="fa fa-toggle-right"></i></button>').text(n.users.length).appendTo(controls).on("click",function(evt) {
                 evt.preventDefault();
@@ -169,7 +152,7 @@ RED.sidebar.info.outliner = (function() {
         //     evt.stopPropagation();
         //     RED.view.reveal(n.id);
         // })
-        if (n.type !== 'group' && n.type !== 'subflow') {
+        if (n.type !== 'subflow') {
             var toggleButton = $('<button type="button" class="red-ui-info-outline-item-control-disable red-ui-button red-ui-button-small"><i class="fa fa-circle-thin"></i><i class="fa fa-ban"></i></button>').appendTo(controls).on("click",function(evt) {
                 evt.preventDefault();
                 evt.stopPropagation();
@@ -179,6 +162,46 @@ RED.sidebar.info.outliner = (function() {
                     } else {
                         RED.workspaces.disable(n.id)
                     }
+                } else if (n.type === 'group') {
+                    var groupNodes = RED.group.getNodes(n,true);
+                    var groupHistoryEvent = {
+                        t:'multi',
+                        events:[],
+                        dirty: RED.nodes.dirty()
+                    }
+                    var targetState;
+                    groupNodes.forEach(function(n) {
+                        if (n.type !== 'group') {
+                            if (targetState === undefined) {
+                                targetState = !n.d;
+                            }
+                            var state = !!n.d;
+                            if (state !== targetState) {
+                                var historyEvent = {
+                                    t: "edit",
+                                    node: n,
+                                    changed: n.changed,
+                                    changes: {
+                                        d: n.d
+                                    }
+                                }
+                                if (n.d) {
+                                    delete n.d;
+                                } else {
+                                    n.d = true;
+                                }
+                                n.dirty = true;
+                                n.changed = true;
+                                RED.events.emit("nodes:change",n);
+                                groupHistoryEvent.events.push(historyEvent);
+                            }
+                        }
+                        if (groupHistoryEvent.events.length > 0) {
+                            RED.history.push(groupHistoryEvent);
+                            RED.nodes.dirty(true)
+                            RED.view.redraw();
+                        }
+                    })
                 } else {
                     // TODO: this ought to be a utility function in RED.nodes
                     var historyEvent = {
@@ -198,11 +221,15 @@ RED.sidebar.info.outliner = (function() {
                     n.dirty = true;
                     n.changed = true;
                     RED.events.emit("nodes:change",n);
+                    RED.history.push(historyEvent);
                     RED.nodes.dirty(true)
                     RED.view.redraw();
                 }
             });
             RED.popover.tooltip(toggleButton,function() {
+                if (n.type === "group") {
+                    return RED._("common.label.enable")+" / "+RED._("common.label.disable")
+                }
                 return RED._("common.label."+(((n.type==='tab' && n.disabled) || (n.type!=='tab' && n.d))?"enable":"disable"));
             });
         } else {
@@ -486,6 +513,13 @@ RED.sidebar.info.outliner = (function() {
         existingObject.treeList.remove();
         delete objects[n.id]
 
+        if (/^subflow:/.test(n.type)) {
+            var sfType = n.type.substring(8);
+            if (objects[sfType]) {
+                objects[sfType].element.find(".red-ui-info-outline-item-control-users").text(RED.nodes.subflow(sfType).instances.length);
+            }
+        }
+
         // If this is a group being removed, it may have an empty item
         if (empties[n.id]) {
             delete empties[n.id];
@@ -587,6 +621,12 @@ RED.sidebar.info.outliner = (function() {
             configNodeTypes[parent].types[n.type].treeList.addChild(objects[n.id]);
         }
         objects[n.id].element.toggleClass("red-ui-info-outline-item-disabled", !!n.d)
+        if (/^subflow:/.test(n.type)) {
+            var sfType = n.type.substring(8);
+            if (objects[sfType]) {
+                objects[sfType].element.find(".red-ui-info-outline-item-control-users").text(RED.nodes.subflow(sfType).instances.length);
+            }
+        }
         updateSearch();
     }
 
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
index d84f47f73..bf03d2146 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -338,7 +338,7 @@ RED.sidebar.info = (function() {
                                 count++;
                                 propRow = $('<tr class="red-ui-help-info-property-row'+(expandedSections.property?"":" hide")+'"><td></td><td></td></tr>').appendTo(tableBody);
                                 $(propRow.children()[0]).text(n);
-                                if (defaults[n].type) {
+                                if (defaults[n].type && !defaults[n]._type.array) {
                                     var configNode = RED.nodes.node(val);
                                     if (!configNode) {
                                         RED.utils.createObjectElement(undefined).appendTo(propRow.children()[1]);
@@ -382,21 +382,14 @@ RED.sidebar.info = (function() {
                 var category = subflowNode.category||"subflows";
                 $(propRow.children()[1]).text(RED._("palette.label."+category,{defaultValue:category}))
                 $('<tr class="node-info-subflow-row"><td>'+RED._("sidebar.info.instances")+"</td><td>"+subflowUserCount+'</td></tr>').appendTo(tableBody);
+                if (subflowNode.meta) {
+                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("subflow.module")+'</td><td></td></tr>').appendTo(tableBody);
+                    $(propRow.children()[1]).text(subflowNode.meta.module||"")
+                    propRow = $('<tr class="red-ui-help-info-row"><td>'+RED._("subflow.version")+'</td><td></td></tr>').appendTo(tableBody);
+                    $(propRow.children()[1]).text(subflowNode.meta.version||"")
+                }
             }
 
-            // var helpText = "";
-            // if (node.type === "tab" || node.type === "subflow") {
-            // } else {
-            //     if (subflowNode && node.type !== "subflow") {
-            //         // Selected a subflow instance node.
-            //         // - The subflow template info goes into help
-            //         helpText = (RED.utils.renderMarkdown(subflowNode.info||"")||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>'));
-            //     } else {
-            //         helpText = $("script[data-help-name='"+node.type+"']").html()||('<span class="red-ui-help-info-none">'+RED._("sidebar.info.none")+'</span>');
-            //     }
-            //     setInfoText(helpText, helpSection.content);
-            // }
-
             var infoText = "";
 
             if (node._def && node._def.info) {
@@ -409,23 +402,6 @@ RED.sidebar.info = (function() {
             }
             var infoSectionContainer = $("<div>").css("padding","0 6px 6px").appendTo(propertiesPanelContent)
 
-            // var editInfo = $('<button class="red-ui-button red-ui-button-small" style="float: right"><i class="fa fa-file-text-o"></button>').appendTo(infoSectionContainer).on("click", function(evt) {
-            //     //.text(RED._("sidebar.info.editDescription"))
-            //     evt.preventDefault();
-            //     evt.stopPropagation();
-            //     if (node.type === 'tab') {
-            //
-            //     } else if (node.type === 'subflow') {
-            //
-            //     } else if (node.type === 'group') {
-            //
-            //     } else if (node._def.category !== 'config') {
-            //         RED.editor.edit(node,"editor-tab-description");
-            //     } else {
-            //
-            //     }
-            // })
-
             setInfoText(infoText, infoSectionContainer);
 
             $(".red-ui-sidebar-info-stack").scrollTop(0);
diff --git 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
index 07ab12180..2bdae4b13 100644
--- 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
@@ -109,13 +109,19 @@ RED.userSettings = (function() {
     function compText(a, b) {
         return a.text.localeCompare(b.text);
     }
-    
+
     var viewSettings = [
         {
             options: [
                 {setting:"editor-language",local: true, label:"menu.label.view.language",options:function(done){ done([{val:'',text:RED._('menu.label.view.browserDefault')}].concat(RED.settings.theme("languages").map(localeToName).sort(compText))) }},
             ]
-        },{
+        },
+        // {
+        //     options: [
+        //         {setting:"theme", label:"Theme",options:function(done){ done([{val:'',text:'default'}].concat(RED.settings.theme("themes"))) }},
+        //     ]
+        // },
+        {
             title: "menu.label.view.grid",
             options: [
                 {setting:"view-show-grid",oldSetting:"menu-menu-item-view-show-grid",label:"menu.label.view.showGrid", default: true, toggle:true,onchange:"core:toggle-show-grid"},
diff --git 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
index 230f561f9..599b5dd8e 100644
--- 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
@@ -615,18 +615,25 @@ RED.utils = (function() {
         return element;
     }
 
-    function normalisePropertyExpression(str) {
+    function createError(code, message) {
+        var e = new Error(message);
+        e.code = code;
+        return e;
+    }
+
+    function normalisePropertyExpression(str,msg) {
         // This must be kept in sync with validatePropertyExpression
         // in editor/js/ui/utils.js
 
         var length = str.length;
         if (length === 0) {
-            throw new Error("Invalid property expression: zero-length");
+            throw createError("INVALID_EXPR","Invalid property expression: zero-length");
         }
         var parts = [];
         var start = 0;
         var inString = false;
         var inBox = false;
+        var boxExpression = false;
         var quoteChar;
         var v;
         for (var i=0;i<length;i++) {
@@ -634,14 +641,14 @@ RED.utils = (function() {
             if (!inString) {
                 if (c === "'" || c === '"') {
                     if (i != start) {
-                        throw new Error("Invalid property expression: unexpected "+c+" at position "+i);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+c+" at position "+i);
                     }
                     inString = true;
                     quoteChar = c;
                     start = i+1;
                 } else if (c === '.') {
                     if (i===0) {
-                        throw new Error("Invalid property expression: unexpected . at position 0");
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected . at position 0");
                     }
                     if (start != i) {
                         v = str.substring(start,i);
@@ -652,57 +659,99 @@ RED.utils = (function() {
                         }
                     }
                     if (i===length-1) {
-                        throw new Error("Invalid property expression: unterminated expression");
+                        throw createError("INVALID_EXPR","Invalid property expression: unterminated expression");
                     }
                     // Next char is first char of an identifier: a-z 0-9 $ _
                     if (!/[a-z0-9\$\_]/i.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
                     }
                     start = i+1;
                 } else if (c === '[') {
                     if (i === 0) {
-                        throw new Error("Invalid property expression: unexpected "+c+" at position "+i);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+c+" at position "+i);
                     }
                     if (start != i) {
                         parts.push(str.substring(start,i));
                     }
                     if (i===length-1) {
-                        throw new Error("Invalid property expression: unterminated expression");
+                        throw createError("INVALID_EXPR","Invalid property expression: unterminated expression");
                     }
-                    // Next char is either a quote or a number
-                    if (!/["'\d]/.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
+                    // Start of a new expression. If it starts with msg it is a nested expression
+                    // Need to scan ahead to find the closing bracket
+                    if (/^msg[.\[]/.test(str.substring(i+1))) {
+                        var depth = 1;
+                        var inLocalString = false;
+                        var localStringQuote;
+                        for (var j=i+1;j<length;j++) {
+                            if (/["']/.test(str[j])) {
+                                if (inLocalString) {
+                                    if (str[j] === localStringQuote) {
+                                        inLocalString = false
+                                    }
+                                } else {
+                                    inLocalString = true;
+                                    localStringQuote = str[j]
+                                }
+                            }
+                            if (str[j] === '[') {
+                                depth++;
+                            } else if (str[j] === ']') {
+                                depth--;
+                            }
+                            if (depth === 0) {
+                                try {
+                                    if (msg) {
+                                        parts.push(getMessageProperty(msg, str.substring(i+1,j)))
+                                    } else {
+                                        parts.push(normalisePropertyExpression(str.substring(i+1,j), msg));
+                                    }
+                                    inBox = false;
+                                    i = j;
+                                    start = j+1;
+                                    break;
+                                } catch(err) {
+                                    throw createError("INVALID_EXPR","Invalid expression started at position "+(i+1))
+                                }
+                            }
+                        }
+                        if (depth > 0) {
+                            throw createError("INVALID_EXPR","Invalid property expression: unmatched '[' at position "+i);
+                        }
+                        continue;
+                    } else if (!/["'\d]/.test(str[i+1])) {
+                        // Next char is either a quote or a number
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
                     }
                     start = i+1;
                     inBox = true;
                 } else if (c === ']') {
                     if (!inBox) {
-                        throw new Error("Invalid property expression: unexpected "+c+" at position "+i);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+c+" at position "+i);
                     }
                     if (start != i) {
                         v = str.substring(start,i);
                         if (/^\d+$/.test(v)) {
                             parts.push(parseInt(v));
                         } else {
-                            throw new Error("Invalid property expression: unexpected array expression at position "+start);
+                            throw createError("INVALID_EXPR","Invalid property expression: unexpected array expression at position "+start);
                         }
                     }
                     start = i+1;
                     inBox = false;
                 } else if (c === ' ') {
-                    throw new Error("Invalid property expression: unexpected ' ' at position "+i);
+                    throw createError("INVALID_EXPR","Invalid property expression: unexpected ' ' at position "+i);
                 }
             } else {
                 if (c === quoteChar) {
                     if (i-start === 0) {
-                        throw new Error("Invalid property expression: zero-length string at position "+start);
+                        throw createError("INVALID_EXPR","Invalid property expression: zero-length string at position "+start);
                     }
                     parts.push(str.substring(start,i));
                     // If inBox, next char must be a ]. Otherwise it may be [ or .
                     if (inBox && !/\]/.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected array expression at position "+start);
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected array expression at position "+start);
                     } else if (!inBox && i+1!==length && !/[\[\.]/.test(str[i+1])) {
-                        throw new Error("Invalid property expression: unexpected "+str[i+1]+" expression at position "+(i+1));
+                        throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" expression at position "+(i+1));
                     }
                     start = i+1;
                     inString = false;
@@ -711,7 +760,7 @@ RED.utils = (function() {
 
         }
         if (inBox || inString) {
-            throw new Error("Invalid property expression: unterminated expression");
+            throw new createError("INVALID_EXPR","Invalid property expression: unterminated expression");
         }
         if (start < length) {
             parts.push(str.substring(start));
diff --git 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
index 888871f4b..e6bf6476c 100755
--- 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
@@ -2276,7 +2276,7 @@ RED.view = (function() {
     }
 
     function calculateTextWidth(str, className) {
-        var result=convertLineBreakCharacter(str);
+        var result = convertLineBreakCharacter(str);
         var width = 0;
         for (var i=0;i<result.length;i++) {
             var calculateTextW=calculateTextDimensions(result[i],className)[0];
diff --git a/packages/node_modules/@node-red/editor-client/src/js/user.js b/packages/node_modules/@node-red/editor-client/src/js/user.js
index dd0ff8f90..bd7339285 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/user.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/user.js
@@ -219,7 +219,7 @@ RED.user = (function() {
 
     function init() {
         if (RED.settings.user) {
-            if (!RED.settings.editorTheme || !RED.settings.editorTheme.hasOwnProperty("userMenu")) {
+            if (!RED.settings.editorTheme || !RED.settings.editorTheme.hasOwnProperty("userMenu") || RED.settings.editorTheme.userMenu) {
 
                 var userMenu = $('<li><a id="red-ui-header-button-user" class="button hide" href="#"></a></li>')
                     .prependTo(".red-ui-header-toolbar");
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/base.scss b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
index 391ddf83f..ca1a5807f 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@@ -15,6 +15,9 @@
 **/
 
 
+body {
+    overflow: hidden;
+}
 
 .red-ui-editor {
     font-size: $primary-font-size;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 1f3cdb181..aefd617c0 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -765,6 +765,10 @@ button.red-ui-toggleButton.toggle {
                     width: calc(100% - 10px);
                     padding-left: 3px;
                 }
+                select {
+                    padding: 0 3px;
+                    font-size: 11px;
+                }
                 .placeholder-input {
                     span:first-child {
                         display:inline-block;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
index 6690c22ed..f63c26279 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
@@ -139,6 +139,9 @@
     stroke-width: 2;
 }
 .red-ui-flow-node-icon-group {
+    text {
+        @include disable-selection;
+    }
     .fa-lg {
         @include disable-selection;
         stroke: none;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/library.scss b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
index 26b17f38e..89109f357 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/library.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/library.scss
@@ -29,8 +29,30 @@
         }
     }
 }
-.red-ui-clipboard-dialog-tab-clipboard {
+
+#red-ui-clipboard-dialog-export-tab-clipboard-preview {
+    .red-ui-treeList-container,.red-ui-editableList-border {
+        border: none;
+        border-radius: 0;
+    }
+}
+#red-ui-clipboard-dialog-export-tab-clipboard-json {
+    padding: 10px 10px 0;
+}
+#red-ui-clipboard-dialog-import-tab-clipboard {
     padding: 10px;
+}
+.red-ui-clipboard-dialog-export-tab-clipboard-tab {
+    position: absolute;
+    top: 40px;
+    right: 0;
+    left: 0;
+    bottom: 0;
+}
+
+.red-ui-clipboard-dialog-tab-clipboard {
+
+
     textarea {
          resize: none;
          width: 100%;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
index 7a2b53eb2..385ad761f 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/palette.scss
@@ -131,10 +131,10 @@
     width: 120px;
     background-size: contain;
     position: relative;
-    &:not(.red-ui-palette-node-config):first-child {
+    &:not(.red-ui-palette-node-config):not(.red-ui-palette-node-small):first-child {
         margin-top: 15px;
     }
-    &:not(.red-ui-palette-node-config):last-child {
+    &:not(.red-ui-palette-node-config):not(.red-ui-palette-node-small):first-child {
         margin-bottom: 15px;
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
index c28c0acfa..42d5462f7 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-info.scss
@@ -326,7 +326,7 @@ div.red-ui-info-table {
         border-bottom: 1px solid $secondary-border-color;
     }
 }
-.red-ui-info-outline,.red-ui-sidebar-help-toc, #red-ui-clipboard-dialog-import-conflicts-list {
+.red-ui-info-outline,.red-ui-sidebar-help-toc, #red-ui-clipboard-dialog-import-conflicts-list, #red-ui-clipboard-dialog-export-tab-clipboard-preview {
     .red-ui-info-outline-item {
         display: inline-block;
         padding: 0;
diff --git 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
index fb3e331ee..14cb3f70e 100644
--- 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
@@ -26,6 +26,14 @@
     box-sizing: border-box;
     overflow:visible;
     position: relative;
+    &[disabled] {
+        input, button {
+            background: $secondary-background-inactive;
+            pointer-events: none;
+            cursor: not-allowed;
+        }
+    }
+    
     .red-ui-typedInput-input-wrap {
         flex-grow: 1;
     }
diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.html b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
index 9c49648e3..a6a7a2a45 100644
--- a/packages/node_modules/@node-red/nodes/core/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.html
@@ -18,7 +18,7 @@
         color:"#c0edc0",
         defaults: {
             name: {value:""},
-            scope: {value:[]},
+            scope: {value:[], type:"*[]"},
             uncaught: {value:false}
         },
         inputs:0,
diff --git a/packages/node_modules/@node-red/nodes/core/common/25-catch.html b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
index 1fa94258f..0b976ea78 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-catch.html
@@ -30,7 +30,7 @@
         color:"#e49191",
         defaults: {
             name: {value:""},
-            scope: {value:null},
+            scope: {value:null, type:"*[]"},
             uncaught: {value:false}
         },
         inputs:0,
diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.html b/packages/node_modules/@node-red/nodes/core/common/25-status.html
index dc2f8893d..47a3192e4 100644
--- a/packages/node_modules/@node-red/nodes/core/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/core/common/25-status.html
@@ -26,7 +26,7 @@
         color:"#94c1d0",
         defaults: {
             name: {value:""},
-            scope: {value:null}
+            scope: {value:null, type:"*[]"}
         },
         inputs:0,
         outputs:1,
diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.html b/packages/node_modules/@node-red/nodes/core/common/60-link.html
index 7953c9979..c9207a345 100644
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html
@@ -187,7 +187,7 @@
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
-            links: { value: [] }
+            links: { value: [], type:"link out[]" }
         },
         inputs:0,
         outputs:1,
@@ -216,7 +216,7 @@
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: {value:""},
-            links: { value: []}
+            links: { value: [], type:"link in[]"}
         },
         align:"right",
         inputs:1,
diff --git a/packages/node_modules/@node-red/nodes/core/function/15-change.js b/packages/node_modules/@node-red/nodes/core/function/15-change.js
index 0eb18eff3..55b9f44e9 100644
--- 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,6 +168,10 @@ 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)) {
+                            // The key has a nest msg. reference to evaluate first
+                            context.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
+                        }
                         node.context()[rule.fromt].get(contextKey.key, contextKey.store, (err,fromValue) => {
                             if (err) {
                                 done(err)
@@ -243,6 +247,10 @@ module.exports = function(RED) {
                                     return done(undefined,msg);
                                 } else if (rule.pt === 'flow' || rule.pt === 'global') {
                                     var contextKey = RED.util.parseContextStore(property);
+                                    if (/\[msg/.test(contextKey.key)) {
+                                        // The key has a nest msg. reference to evaluate first
+                                        contextKey.key = RED.util.normalisePropertyExpression(contextKey.key, msg, true)
+                                    }
                                     var target = node.context()[rule.pt];
                                     var callback = err => {
                                         if (err) {
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-delay.js b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
index b700913cc..b9f76ef9e 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
@@ -80,10 +80,10 @@ module.exports = function(RED) {
         this.drop = n.drop;
         var node = this;
 
-        function ourTimeout(handler, delay) {
+        function ourTimeout(handler, delay, clearHandler) {
             var toutID = setTimeout(handler, delay);
             return {
-                clear: function() { clearTimeout(toutID); },
+                clear: function() { clearTimeout(toutID); clearHandler(); },
                 trigger: function() { clearTimeout(toutID); return handler(); }
             };
         }
@@ -113,14 +113,15 @@ module.exports = function(RED) {
         }
 
         if (node.pauseType === "delay") {
-            node.on("input", function(msg) {
-                if (msg.hasOwnProperty("flush")) { flushDelayList(); }
+            node.on("input", function(msg, send, done) {
+                if (msg.hasOwnProperty("flush")) { flushDelayList(); done(); }
                 else {
                     var id = ourTimeout(function() {
                         node.idList.splice(node.idList.indexOf(id),1);
                         if (node.idList.length === 0) { node.status({}); }
-                        node.send(msg);
-                    }, node.timeout);
+                        send(msg);
+                        done();
+                    }, node.timeout, () => done());
                     node.idList.push(id);
                     if ((node.timeout > 1000) && (node.idList.length !== 0)) {
                         node.status({fill:"blue",shape:"dot",text:" "});
@@ -131,7 +132,7 @@ module.exports = function(RED) {
             node.on("close", function() { clearDelayList(); });
         }
         else if (node.pauseType === "delayv") {
-            node.on("input", function(msg) {
+            node.on("input", function(msg, send, done) {
                 var delayvar = Number(node.timeout);
                 if (msg.hasOwnProperty("delay") && !isNaN(parseFloat(msg.delay))) {
                     delayvar = parseFloat(msg.delay);
@@ -140,8 +141,9 @@ module.exports = function(RED) {
                 var id = ourTimeout(function() {
                     node.idList.splice(node.idList.indexOf(id),1);
                     if (node.idList.length === 0) { node.status({}); }
-                    node.send(msg);
-                }, delayvar);
+                    send(msg);
+                    done();
+                }, delayvar, () => done());
                 node.idList.push(id);
                 if ((delayvar >= 0) && (node.idList.length !== 0)) {
                     node.status({fill:"blue",shape:"dot",text:delayvar/1000+"s"});
@@ -152,7 +154,7 @@ module.exports = function(RED) {
             node.on("close", function() { clearDelayList(); });
         }
         else if (node.pauseType === "rate") {
-            node.on("input", function(msg) {
+            node.on("input", function(msg, send, done) {
                 if (msg.hasOwnProperty("reset")) {
                     if (node.intervalID !== -1 ) {
                         clearInterval(node.intervalID);
@@ -161,17 +163,18 @@ module.exports = function(RED) {
                     delete node.lastSent;
                     node.buffer = [];
                     node.status({text:"reset"});
+                    done();
                     return;
                 }
                 if (!node.drop) {
                     var m = RED.util.cloneMessage(msg);
                     delete m.flush;
                     if (node.intervalID !== -1) {
-                        node.buffer.push(m);
+                        node.buffer.push({msg: m, send: send, done: done});
                         node.reportDepth();
                     }
                     else {
-                        node.send(m);
+                        send(m);
                         node.reportDepth();
                         node.intervalID = setInterval(function() {
                             if (node.buffer.length === 0) {
@@ -179,16 +182,22 @@ module.exports = function(RED) {
                                 node.intervalID = -1;
                             }
                             if (node.buffer.length > 0) {
-                                node.send(node.buffer.shift());
+                                const msgInfo = node.buffer.shift();
+                                msgInfo.send(msgInfo.msg);
+                                msgInfo.done();
                             }
                             node.reportDepth();
                         }, node.rate);
+                        done();
                     }
                     if (msg.hasOwnProperty("flush")) {
                         while (node.buffer.length > 0) {
-                            node.send(node.buffer.shift());
+                            const msgInfo = node.buffer.shift();
+                            msgInfo.send(msgInfo.msg);
+                            msgInfo.done();
                         }
                         node.status({});
+                        done();
                     }
                 }
                 else {
@@ -198,17 +207,19 @@ module.exports = function(RED) {
                     }
                     if (!node.lastSent) { // ensuring that we always send the first message
                         node.lastSent = process.hrtime();
-                        node.send(msg);
+                        send(msg);
                     }
                     else if ( ( (timeSinceLast[0] * SECONDS_TO_NANOS) + timeSinceLast[1] ) > (node.rate * MILLIS_TO_NANOS) ) {
                         node.lastSent = process.hrtime();
-                        node.send(msg);
+                        send(msg);
                     }
+                    done();
                 }
             });
             node.on("close", function() {
                 clearInterval(node.intervalID);
                 clearTimeout(node.busy);
+                node.buffer.forEach((msgInfo) => msgInfo.done());
                 node.buffer = [];
                 node.status({});
             });
@@ -217,57 +228,75 @@ module.exports = function(RED) {
             node.intervalID = setInterval(function() {
                 if (node.pauseType === "queue") {
                     if (node.buffer.length > 0) {
-                        node.send(node.buffer.shift()); // send the first on the queue
+                        const msgInfo = node.buffer.shift();
+                        msgInfo.send(msgInfo.msg); // send the first on the queue
+                        msgInfo.done();
                     }
                 }
                 else {
                     while (node.buffer.length > 0) {    // send the whole queue
-                        node.send(node.buffer.shift());
+                        const msgInfo = node.buffer.shift();
+                        msgInfo.send(msgInfo.msg);
+                        msgInfo.done();
                     }
                 }
                 node.reportDepth();
             },node.rate);
 
             var hit;
-            node.on("input", function(msg) {
+            node.on("input", function(msg, send, done) {
                 if (!msg.hasOwnProperty("topic")) { msg.topic = "_none_"; }
                 hit = false;
                 for (var b in node.buffer) { // check if already in queue
-                    if (msg.topic === node.buffer[b].topic) {
-                        node.buffer[b] = msg; // if so - replace existing entry
+                    if (msg.topic === node.buffer[b].msg.topic) {
+                        node.buffer[b].done();
+                        node.buffer[b] = {msg, send, done}; // if so - replace existing entry
                         hit = true;
                         break;
                     }
                 }
                 if (!hit) {
-                    node.buffer.push(msg); // if not add to end of queue
+                    node.buffer.push({msg, send, done}); // if not add to end of queue
                     node.reportDepth();
                 }
                 if (msg.hasOwnProperty("reset")) {
+                    while (node.buffer.length > 0) {
+                        const msgInfo = node.buffer.shift();
+                        msgInfo.done();
+                    }
                     node.buffer = [];
                     node.status({text:"reset"});
+                    done();
                 }
                 if (msg.hasOwnProperty("flush")) {
                     while (node.buffer.length > 0) {
-                        node.send(node.buffer.shift());
+                        const msgInfo = node.buffer.shift();
+                        msgInfo.send(msgInfo.msg);
+                        msgInfo.done();
                     }
                     node.status({});
+                    done();
                 }
             });
             node.on("close", function() {
                 clearInterval(node.intervalID);
+                while (node.buffer.length > 0) {
+                    const msgInfo = node.buffer.shift();
+                    msgInfo.done();
+                }
                 node.buffer = [];
                 node.status({});
             });
         }
         else if (node.pauseType === "random") {
-            node.on("input", function(msg) {
+            node.on("input", function(msg, send, done) {
                 var wait = node.randomFirst + (node.diff * Math.random());
                 var id = ourTimeout(function() {
                     node.idList.splice(node.idList.indexOf(id),1);
-                    node.send(msg);
+                    send(msg);
                     node.status({});
-                }, wait);
+                    done();
+                }, wait, () => done());
                 node.idList.push(id);
                 if ((node.timeout >= 1000) && (node.idList.length !== 0)) {
                     node.status({fill:"blue",shape:"dot",text:parseInt(wait/10)/100+"s"});
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
index 7b5b820b7..16a00e99d 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
@@ -82,10 +82,10 @@ module.exports = function(RED) {
         var npay = {};
         var pendingMessages = [];
         var activeMessagePromise = null;
-        var processMessageQueue = function(msg) {
-            if (msg) {
+        var processMessageQueue = function(msgInfo) {
+            if (msgInfo) {
                 // A new message has arrived - add it to the message queue
-                pendingMessages.push(msg);
+                pendingMessages.push(msgInfo);
                 if (activeMessagePromise !== null) {
                     // The node is currently processing a message, so do nothing
                     // more with this message
@@ -101,17 +101,17 @@ module.exports = function(RED) {
 
             // There are more messages to process. Get the next message and
             // start processing it. Recurse back in to check for any more
-            var nextMsg = pendingMessages.shift();
-            activeMessagePromise = processMessage(nextMsg)
+            var nextMsgInfo = pendingMessages.shift();
+            activeMessagePromise = processMessage(nextMsgInfo)
                 .then(processMessageQueue)
                 .catch((err) => {
-                    node.error(err,nextMsg);
+                    nextMsgInfo.done(err);
                     return processMessageQueue();
                 });
         }
 
-        this.on('input', function(msg) {
-            processMessageQueue(msg);
+        this.on('input', function(msg, send, done) {
+            processMessageQueue({msg, send, done});
         });
 
         var stat = function() {
@@ -121,7 +121,8 @@ module.exports = function(RED) {
             else return {fill:"blue",shape:"dot",text:l};
         }
 
-        var processMessage = function(msg) {
+        var processMessage = function(msgInfo) {
+            let msg = msgInfo.msg;
             var topic = RED.util.getMessageProperty(msg,node.topic) || "_none";
             var promise;
             var delayDuration = node.duration;
@@ -179,7 +180,10 @@ module.exports = function(RED) {
                                 /* istanbul ignore else  */
                                 if (node.op1type !== "nul") {
                                     var msg2 = RED.util.cloneMessage(msg);
-                                    node.topics[topic].tout = setInterval(function() { node.send(RED.util.cloneMessage(msg2)); }, delayDuration);
+                                    node.topics[topic].tout = setInterval(function() {
+                                        if (node.op1type === "date") { msg2.payload = Date.now(); }
+                                        msgInfo.send(RED.util.cloneMessage(msg2));
+                                    }, delayDuration);
                                 }
                             }
                             else {
@@ -203,14 +207,15 @@ module.exports = function(RED) {
                                             }
                                             promise.then(() => {
                                                 if (node.op2type === "payl") {
-                                                    if (node.second === true) { node.send([null,npay[topic]]); }
-                                                    else { node.send(npay[topic]); }
+                                                    if (node.second === true) { msgInfo.send([null,npay[topic]]); }
+                                                    else { msgInfo.send(npay[topic]); }
                                                     delete npay[topic];
                                                 }
                                                 else {
                                                     msg2.payload = node.topics[topic].m2;
-                                                    if (node.second === true) { node.send([null,msg2]); }
-                                                    else { node.send(msg2); }
+                                                    if (node.op2type === "date") { msg2.payload = Date.now(); }
+                                                    if (node.second === true) { msgInfo.send([null,msg2]); }
+                                                    else { msgInfo.send(msg2); }
                                                 }
                                                 delete node.topics[topic];
                                                 node.status(stat());
@@ -225,8 +230,9 @@ module.exports = function(RED) {
                                     }, delayDuration);
                                 }
                             }
+                            msgInfo.done();
                             node.status(stat());
-                            if (node.op1type !== "nul") { node.send(RED.util.cloneMessage(msg)); }
+                            if (node.op1type !== "nul") { msgInfo.send(RED.util.cloneMessage(msg)); }
                         });
                     });
                 }
@@ -262,8 +268,8 @@ module.exports = function(RED) {
                             }
                             delete node.topics[topic];
                             node.status(stat());
-                            if (node.second === true) { node.send([null,msg2]); }
-                            else { node.send(msg2); }
+                            if (node.second === true) { msgInfo.send([null,msg2]); }
+                            else { msgInfo.send(msg2); }
                         }).catch(err => {
                             node.error(err);
                         });
@@ -273,6 +279,7 @@ module.exports = function(RED) {
                 //     if (node.op2type === "payl") {node.topics[topic].m2 = RED.util.cloneMessage(msg.payload); }
                 // }
             }
+            msgInfo.done();
             return Promise.resolve();
         }
         this.on("close", function() {
diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
index 636117d71..789e15f75 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -52,7 +52,7 @@
         color:"darksalmon",
         defaults: {
             command: {value:""},
-            addpay: {value:true},
+            addpay: {value:false},
             append: {value:""},
             useSpawn: {value:"false"},
             timer: {value:""},
diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
index 0df3e6012..132286cb4 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
@@ -31,12 +31,12 @@ module.exports = function(RED) {
         this.timer = Number(n.timer || 0)*1000;
         this.activeProcesses = {};
         this.oldrc = (n.oldrc || false).toString();
-	this.execOpt = {encoding:'binary', maxBuffer:10000000};
+        this.execOpt = {encoding:'binary', maxBuffer:RED.settings.execMaxBufferSize||10000000};
         var node = this;
 
-	if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { node.execOpt.shell = '/bin/bash'; }
-	    
-	var cleanup = function(p) {
+        if (process.platform === 'linux' && fs.existsSync('/bin/bash')) { node.execOpt.shell = '/bin/bash'; }
+
+        var cleanup = function(p) {
             node.activeProcesses[p].kill();
             //node.status({fill:"red",shape:"dot",text:"timeout"});
             //node.error("Exec node timeout");
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
index d1e2941b4..26234b737 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httpin.js
@@ -210,7 +210,7 @@ module.exports = function(RED) {
             var httpMiddleware = function(req,res,next) { next(); }
 
             if (RED.settings.httpNodeMiddleware) {
-                if (typeof RED.settings.httpNodeMiddleware === "function") {
+                if (typeof RED.settings.httpNodeMiddleware === "function" || Array.isArray(RED.settings.httpNodeMiddleware)) {
                     httpMiddleware = RED.settings.httpNodeMiddleware;
                 }
             }
diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
index ae0eaedda..2aab13437 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
@@ -235,6 +235,7 @@
         oneditprepare: function() {
             var previous = null;
             $("#node-input-out").on('focus', function () { previous = this.value; }).on("change", function() {
+                $("#node-input-splitc").show();
                 if (previous === null) { previous = $("#node-input-out").val(); }
                 if ($("#node-input-out").val() == "char") {
                     if (previous != "char") { $("#node-input-splitc").val("\\n"); }
@@ -247,6 +248,7 @@
                 else if ($("#node-input-out").val() == "immed") {
                     if (previous != "immed") { $("#node-input-splitc").val(" "); }
                     $("#node-units").text("");
+                    $("#node-input-splitc").hide();
                 }
                 else if ($("#node-input-out").val() == "count") {
                     if (previous != "count") { $("#node-input-splitc").val("12"); }
@@ -255,6 +257,7 @@
                 else {
                     if (previous != "sit") { $("#node-input-splitc").val(" "); }
                     $("#node-units").text("");
+                    $("#node-input-splitc").hide();
                 }
             });
         }
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
index c7016a46a..5e2576491 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -18,7 +18,7 @@ module.exports = function(RED) {
     "use strict";
     function CSVNode(n) {
         RED.nodes.createNode(this,n);
-        this.template = (n.temp || "").split(",");
+        this.template = (n.temp || "");
         this.sep = (n.sep || ',').replace("\\t","\t").replace("\\n","\n").replace("\\r","\r");
         this.quo = '"';
         this.ret = (n.ret || "\n").replace("\\n","\n").replace("\\r","\r");
@@ -38,16 +38,12 @@ module.exports = function(RED) {
         if (this.hdrout === true) { this.hdrout = "all"; }
         var tmpwarn = true;
         var node = this;
+        var re = new RegExp(',(?=(?:(?:[^"]*"){2})*[^"]*$)','g');
 
         // pass in an array of column names to be trimed, de-quoted and retrimed
         var clean = function(col) {
-            for (var t = 0; t < col.length; t++) {
-                col[t] = col[t].trim(); // remove leading and trailing whitespace
-                if (col[t].charAt(0) === '"' && col[t].charAt(col[t].length -1) === '"') {
-                    // remove leading and trailing quotes (if they exist) - and remove whitepace again.
-                    col[t] = col[t].substr(1,col[t].length -2).trim();
-                }
-            }
+            col = col.trim().split(re) || [""];
+            col = col.map(x => x.replace(/"/g,'').trim());
             if ((col.length === 1) && (col[0] === "")) { node.goodtmpl = false; }
             else { node.goodtmpl = true; }
             return col;
@@ -55,7 +51,7 @@ module.exports = function(RED) {
         node.template = clean(node.template);
         node.hdrSent = false;
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg, send, done) {
             if (msg.hasOwnProperty("reset")) {
                 node.hdrSent = false;
             }
@@ -67,13 +63,14 @@ module.exports = function(RED) {
                         if (node.hdrout !== "none" && node.hdrSent === false) {
                             if ((node.template.length === 1) && (node.template[0] === '')) {
                                 if (msg.hasOwnProperty("columns")) {
-                                    node.template = clean((msg.columns || "").split(","));
+                                    node.template = clean(msg.columns || "");
                                 }
                                 else {
                                     node.template = Object.keys(msg.payload[0]);
                                 }
                             }
-                            ou += node.template.join(node.sep) + node.ret;
+                            // ou += node.template.join(node.sep) + node.ret;
+                            ou += node.template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep) + node.ret;
                             if (node.hdrout === "once") { node.hdrSent = true; }
                         }
                         for (var s = 0; s < msg.payload.length; s++) {
@@ -93,7 +90,7 @@ module.exports = function(RED) {
                             }
                             else {
                                 if ((node.template.length === 1) && (node.template[0] === '') && (msg.hasOwnProperty("columns"))) {
-                                    node.template = clean((msg.columns || "").split(","));
+                                    node.template = clean(msg.columns || "")//.split(","));
                                 }
                                 if ((node.template.length === 1) && (node.template[0] === '')) {
                                     /* istanbul ignore else */
@@ -144,10 +141,11 @@ module.exports = function(RED) {
                             }
                         }
                         msg.payload = ou;
-                        msg.columns = node.template.join(',');
-                        if (msg.payload !== '') { node.send(msg); }
+                        msg.columns = node.template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).join(',');
+                        if (msg.payload !== '') { send(msg); }
+                        done();
                     }
-                    catch(e) { node.error(e,msg); }
+                    catch(e) { done(e); }
                 }
                 else if (typeof msg.payload == "string") { // convert CSV string to object
                     try {
@@ -178,7 +176,7 @@ module.exports = function(RED) {
                             if ((node.hdrin === true) && first) { // if the template is in the first line
                                 if ((line[i] === "\n")||(line[i] === "\r")||(line.length - i === 1)) { // look for first line break
                                     if (line.length - i === 1) { tmp += line[i]; }
-                                    node.template = clean(tmp.split(node.sep));
+                                    node.template = clean(tmp);
                                     first = false;
                                 }
                                 else { tmp += line[i]; }
@@ -254,22 +252,22 @@ module.exports = function(RED) {
                                 }
                                 if (msg.parts.index + 1 === msg.parts.count) {
                                     msg.payload = node.store;
-                                    msg.columns = node.template.filter(val => val).join(',');
+                                    msg.columns = node.template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).filter(v => v).join(',');
                                     delete msg.parts;
-                                    node.send(msg);
+                                    send(msg);
                                     node.store = [];
                                 }
                             }
                             else {
-                                msg.columns = node.template.filter(val => val).join(',');
-                                node.send(msg); // finally send the array
+                                msg.columns = node.template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).filter(v => v).join(',');
+                                send(msg); // finally send the array
                             }
                         }
                         else {
                             var len = a.length;
                             for (var i = 0; i < len; i++) {
                                 var newMessage = RED.util.cloneMessage(msg);
-                                newMessage.columns = node.template.filter(val => val).join(',');
+                                newMessage.columns = node.template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).filter(v => v).join(',');
                                 newMessage.payload = a[i];
                                 if (!has_parts) {
                                     newMessage.parts = {
@@ -286,19 +284,21 @@ module.exports = function(RED) {
                                         newMessage.parts.count -= 1;
                                     }
                                 }
-                                node.send(newMessage);
+                                send(newMessage);
                             }
                         }
                         node.linecount = 0;
+                        done();
                     }
-                    catch(e) { node.error(e,msg); }
+                    catch(e) { done(e); }
                 }
-                else { node.warn(RED._("csv.errors.csv_js")); }
+                else { node.warn(RED._("csv.errors.csv_js")); done(); }
             }
             else {
                 if (!msg.hasOwnProperty("reset")) {
-                    node.send(msg); // If no payload and not reset - just pass it on.
+                    send(msg); // If no payload and not reset - just pass it on.
                 }
+                done();
             }
         });
     }
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
index 3f774d68c..318319f3d 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
+++ b/packages/node_modules/@node-red/nodes/core/sequence/17-split.js
@@ -17,18 +17,18 @@
 module.exports = function(RED) {
     "use strict";
 
-    function sendArray(node,msg,array) {
+    function sendArray(node,msg,array,send) {
         for (var i = 0; i < array.length-1; i++) {
             msg.payload = array[i];
             msg.parts.index = node.c++;
             if (node.stream !== true) { msg.parts.count = array.length; }
-            node.send(RED.util.cloneMessage(msg));
+            send(RED.util.cloneMessage(msg));
         }
         if (node.stream !== true) {
             msg.payload = array[i];
             msg.parts.index = node.c++;
             msg.parts.count = array.length;
-            node.send(RED.util.cloneMessage(msg));
+            send(RED.util.cloneMessage(msg));
             node.c = 0;
         }
         else { node.remainder = array[i]; }
@@ -67,7 +67,8 @@ module.exports = function(RED) {
         }
         node.c = 0;
         node.buffer = Buffer.from([]);
-        this.on("input", function(msg) {
+        node.pendingDones = [];
+        this.on("input", function(msg, send, done) {
             if (msg.hasOwnProperty("payload")) {
                 if (msg.hasOwnProperty("parts")) { msg.parts = { parts:msg.parts }; } // push existing parts to a stack
                 else { msg.parts = {}; }
@@ -93,14 +94,23 @@ module.exports = function(RED) {
                             msg.payload = data.substring(pos,pos+node.splt);
                             msg.parts.index = node.c++;
                             pos += node.splt;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
+                        }
+                        if (count > 1) {
+                            node.pendingDones.forEach(d => d());
+                            node.pendingDones = [];
                         }
                         node.remainder = data.substring(pos);
                         if ((node.stream !== true) || (node.remainder.length === node.splt)) {
                             msg.payload = node.remainder;
                             msg.parts.index = node.c++;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
+                            node.pendingDones.forEach(d => d());
+                            node.pendingDones = [];
+                            done();
                             node.remainder = "";
+                        } else {
+                            node.pendingDones.push(done);
                         }
                     }
                     else {
@@ -115,7 +125,8 @@ module.exports = function(RED) {
                             a = msg.payload.split(node.splt);
                             msg.parts.ch = node.splt; // pass the split char to other end for rejoin
                         }
-                        sendArray(node,msg,a);
+                        sendArray(node,msg,a,send);
+                        done();
                     }
                 }
                 else if (Array.isArray(msg.payload)) { // then split array into messages
@@ -135,8 +146,9 @@ module.exports = function(RED) {
                         }
                         msg.parts.index = i;
                         pos += node.arraySplt;
-                        node.send(RED.util.cloneMessage(msg));
+                        send(RED.util.cloneMessage(msg));
                     }
+                    done();
                 }
                 else if ((typeof msg.payload === "object") && !Buffer.isBuffer(msg.payload)) {
                     var j = 0;
@@ -152,10 +164,11 @@ module.exports = function(RED) {
                             msg.parts.key = p;
                             msg.parts.index = j;
                             msg.parts.count = l;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
                             j += 1;
                         }
                     }
+                    done();
                 }
                 else if (Buffer.isBuffer(msg.payload)) {
                     var len = node.buffer.length + msg.payload.length;
@@ -176,14 +189,23 @@ module.exports = function(RED) {
                             msg.payload = buff.slice(pos,pos+node.splt);
                             msg.parts.index = node.c++;
                             pos += node.splt;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
+                        }
+                        if (count > 1) {
+                            node.pendingDones.forEach(d => d());
+                            node.pendingDones = [];
                         }
                         node.buffer = buff.slice(pos);
                         if ((node.stream !== true) || (node.buffer.length === node.splt)) {
                             msg.payload = node.buffer;
                             msg.parts.index = node.c++;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
+                            node.pendingDones.forEach(d => d());
+                            node.pendingDones = [];
+                            done();
                             node.buffer = Buffer.from([]);
+                        } else {
+                            node.pendingDones.push(done);
                         }
                     }
                     else {
@@ -210,23 +232,34 @@ module.exports = function(RED) {
                         while (pos > -1) {
                             msg.payload = buff.slice(p,pos);
                             msg.parts.index = node.c++;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
                             i++;
                             p = pos+node.splt.length;
                             pos = buff.indexOf(node.splt,p);
                         }
+                        if (count > 1) {
+                            node.pendingDones.forEach(d => d());
+                            node.pendingDones = [];
+                        }
                         if ((node.stream !== true) && (p < buff.length)) {
                             msg.payload = buff.slice(p,buff.length);
                             msg.parts.index = node.c++;
                             msg.parts.count = node.c++;
-                            node.send(RED.util.cloneMessage(msg));
+                            send(RED.util.cloneMessage(msg));
+                            node.pendingDones.forEach(d => d());
+                            node.pendingDones = [];
                         }
                         else {
                             node.buffer = buff.slice(p,buff.length);
+                            node.pendingDones.push(done);
+                        }
+                        if (node.buffer.length == 0) {
+                            done();
                         }
                     }
-                }
-                //else {  }   // otherwise drop the message.
+                } else { // otherwise drop the message.
+                    done();
+                }  
             }
         });
     }
@@ -264,16 +297,16 @@ module.exports = function(RED) {
     }
 
 
-    function reduceMessageGroup(node,msgs,exp,fixup,count,accumulator,done) {
-        var msg = msgs.shift();
-        exp.assign("I", msg.parts.index);
+    function reduceMessageGroup(node,msgInfos,exp,fixup,count,accumulator,done) {
+        var msgInfo = msgInfos.shift();
+        exp.assign("I", msgInfo.msg.parts.index);
         exp.assign("N", count);
         exp.assign("A", accumulator);
-        RED.util.evaluateJSONataExpression(exp, msg, (err,result) => {
+        RED.util.evaluateJSONataExpression(exp, msgInfo.msg, (err,result) => {
             if (err) {
                 return done(err);
             }
-            if (msgs.length === 0) {
+            if (msgInfos.length === 0) {
                 if (fixup) {
                     fixup.assign("N", count);
                     fixup.assign("A", result);
@@ -281,39 +314,43 @@ module.exports = function(RED) {
                         if (err) {
                             return done(err);
                         }
-                        node.send({payload: result});
+                        msgInfo.send({payload: result});
                         done();
                     });
                 } else {
-                    node.send({payload: result});
+                    msgInfo.send({payload: result});
                     done();
                 }
             } else {
-                reduceMessageGroup(node,msgs,exp,fixup,count,result,done);
+                reduceMessageGroup(node,msgInfos,exp,fixup,count,result,done);
             }
         });
     }
     function reduceAndSendGroup(node, group, done) {
         var is_right = node.reduce_right;
         var flag = is_right ? -1 : 1;
-        var msgs = group.msgs;
+        var msgInfos = group.msgs;
+        const preservedMsgInfos = [...msgInfos];
         try {
             RED.util.evaluateNodeProperty(node.exp_init, node.exp_init_type, node, {}, (err,accum) => {
                 var reduceExpression = node.reduceExpression;
                 var fixupExpression = node.fixupExpression;
                 var count = group.count;
-                msgs.sort(function(x,y) {
-                    var ix = x.parts.index;
-                    var iy = y.parts.index;
+                msgInfos.sort(function(x,y) {
+                    var ix = x.msg.parts.index;
+                    var iy = y.msg.parts.index;
                     if (ix < iy) {return -flag;}
                     if (ix > iy) {return flag;}
                     return 0;
                 });
-                reduceMessageGroup(node, msgs,reduceExpression,fixupExpression,count,accum,(err,result) => {
+                reduceMessageGroup(node, msgInfos,reduceExpression,fixupExpression,count,accum,(err,result) => {
                     if (err) {
+                        preservedMsgInfos.pop(); // omit last message to emit error message
+                        preservedMsgInfos.forEach(mInfo => mInfo.done());
                         done(err);
                         return;
                     } else {
+                        preservedMsgInfos.forEach(mInfo => mInfo.done());
                         done();
                     }
                 })
@@ -323,7 +360,8 @@ module.exports = function(RED) {
         }
     }
 
-    function reduceMessage(node, msg, done) {
+    function reduceMessage(node, msgInfo, done) {
+        let msg = msgInfo.msg;
         if (msg.hasOwnProperty('parts')) {
             var parts = msg.parts;
             var pending = node.pending;
@@ -344,7 +382,7 @@ module.exports = function(RED) {
             if (parts.hasOwnProperty('count') && (group.count === undefined)) {
                 group.count = parts.count;
             }
-            msgs.push(msg);
+            msgs.push(msgInfo);
             pending_count++;
             var completeProcess = function(err) {
                 if (err) {
@@ -353,6 +391,13 @@ module.exports = function(RED) {
                 node.pending_count = pending_count;
                 var max_msgs = maxKeptMsgsCount(node);
                 if ((max_msgs > 0) && (pending_count > max_msgs)) {
+                    Object.values(node.pending).forEach(group => {
+                        group.msgs.forEach(mInfo => {
+                            if (mInfo.msg._msgid !== msgInfo.msg._msgid) {
+                                mInfo.done();
+                            }
+                        });
+                    });
                     node.pending = {};
                     node.pending_count = 0;
                     done(RED._("join.too-many"));
@@ -368,7 +413,8 @@ module.exports = function(RED) {
                 completeProcess();
             }
         } else {
-            node.send(msg);
+            msgInfo.send(msg);
+            msgInfo.done();
             done();
         }
     }
@@ -480,7 +526,9 @@ module.exports = function(RED) {
                 delete group.msg.parts;
             }
             delete group.msg.complete;
-            node.send(RED.util.cloneMessage(group.msg));
+            group.send(RED.util.cloneMessage(group.msg));
+            group.dones.forEach(f => f());
+            group.dones = [];
         }
 
         var pendingMessages = [];
@@ -489,10 +537,10 @@ module.exports = function(RED) {
         // groups may overlap and cause unexpected results. The use of JSONata
         // means some async processing *might* occur if flow/global context is
         // accessed.
-        var processReduceMessageQueue = function(msg) {
-            if (msg) {
+        var processReduceMessageQueue = function(msgInfo) {
+            if (msgInfo) {
                 // A new message has arrived - add it to the message queue
-                pendingMessages.push(msg);
+                pendingMessages.push(msgInfo);
                 if (activeMessage !== null) {
                     // The node is currently processing a message, so do nothing
                     // more with this message
@@ -508,22 +556,23 @@ module.exports = function(RED) {
 
             // There are more messages to process. Get the next message and
             // start processing it. Recurse back in to check for any more
-            var nextMsg = pendingMessages.shift();
+            var nextMsgInfo = pendingMessages.shift();
             activeMessage = true;
-            reduceMessage(node, nextMsg, err => {
+            reduceMessage(node, nextMsgInfo, err => {
                 if (err) {
-                    node.error(err,nextMsg);
-                }
+                    nextMsgInfo.done(err);//.error(err,nextMsg);
+                } 
                 activeMessage = null;
                 processReduceMessageQueue();
             })
         }
 
-        this.on("input", function(msg) {
+        this.on("input", function(msg, send, done) {
             try {
                 var property;
                 if (node.mode === 'auto' && (!msg.hasOwnProperty("parts")||!msg.parts.hasOwnProperty("id"))) {
                     node.warn("Message missing msg.parts property - cannot join in 'auto' mode")
+                    done();
                     return;
                 }
 
@@ -535,6 +584,7 @@ module.exports = function(RED) {
                         property = RED.util.getMessageProperty(msg,node.property);
                     } catch(err) {
                         node.warn("Message property "+node.property+" not found");
+                        done();
                         return;
                     }
                 }
@@ -557,7 +607,7 @@ module.exports = function(RED) {
                     propertyIndex = msg.parts.index;
                 }
                 else if (node.mode === 'reduce') {
-                    return processReduceMessageQueue(msg);
+                    return processReduceMessageQueue({msg, send, done});
                 }
                 else {
                     // Use the node configuration to identify all of the group information
@@ -578,9 +628,11 @@ module.exports = function(RED) {
                         if (inflight[partId].timeout) {
                             clearTimeout(inflight[partId].timeout);
                         }
+                        inflight[partId].dones.forEach(f => f());
                         delete inflight[partId]
                     }
-                    return
+                    done();
+                    return;
                 }
 
                 if ((payloadType === 'object') && (propertyKey === null || propertyKey === undefined || propertyKey === "")) {
@@ -591,6 +643,7 @@ module.exports = function(RED) {
                         if (msg.hasOwnProperty('complete')) {
                             if (inflight[partId]) {
                                 inflight[partId].msg.complete = msg.complete;
+                                inflight[partId].send = send;
                                 completeSend(partId);
                             }
                         }
@@ -598,6 +651,7 @@ module.exports = function(RED) {
                             node.warn("Message missing key property 'msg."+node.key+"' - cannot add to object")
                         }
                     }
+                    done();
                     return;
                 }
 
@@ -608,7 +662,9 @@ module.exports = function(RED) {
                             payload:{},
                             targetCount:targetCount,
                             type:"object",
-                            msg:RED.util.cloneMessage(msg)
+                            msg:RED.util.cloneMessage(msg),
+                            send: send,
+                            dones: []
                         };
                     }
                     else {
@@ -617,7 +673,9 @@ module.exports = function(RED) {
                             payload:[],
                             targetCount:targetCount,
                             type:payloadType,
-                            msg:RED.util.cloneMessage(msg)
+                            msg:RED.util.cloneMessage(msg),
+                            send: send,
+                            dones: []
                         };
                         if (payloadType === 'string') {
                             inflight[partId].joinChar = joinChar;
@@ -634,6 +692,7 @@ module.exports = function(RED) {
                         }, node.timer)
                     }
                 }
+                inflight[partId].dones.push(done);
 
                 var group = inflight[partId];
                 if (payloadType === 'buffer') {
@@ -642,7 +701,7 @@ module.exports = function(RED) {
                             inflight[partId].bufferLen += property.length;
                         }
                         else {
-                            node.error(RED._("join.errors.invalid-type",{error:(typeof property)}),msg);
+                            done(RED._("join.errors.invalid-type",{error:(typeof property)}));
                             return;
                         }
                     }
@@ -676,13 +735,18 @@ module.exports = function(RED) {
                     }
                 }
                 group.msg = Object.assign(group.msg, msg);
+                group.send = send;
                 var tcnt = group.targetCount;
-                if (msg.hasOwnProperty("parts")) { tcnt = group.targetCount || msg.parts.count; }
+                if (msg.hasOwnProperty("parts")) {
+                    tcnt = group.targetCount || msg.parts.count;
+                    group.targetCount = tcnt;
+                }
                 if ((tcnt > 0 && group.currentCount >= tcnt) || msg.hasOwnProperty('complete')) {
                     completeSend(partId);
                 }
             }
             catch(err) {
+                done(err);
                 console.log(err.stack);
             }
         });
@@ -691,9 +755,11 @@ module.exports = function(RED) {
             for (var i in inflight) {
                 if (inflight.hasOwnProperty(i)) {
                     clearTimeout(inflight[i].timeout);
+                    inflight[i].dones.forEach(d => d());
                 }
             }
         });
     }
     RED.nodes.registerType("join",JoinNode);
 }
+
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/18-sort.js b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
index c330801e2..3bcdfb105 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
+++ b/packages/node_modules/@node-red/nodes/core/sequence/18-sort.js
@@ -81,16 +81,16 @@ module.exports = function(RED) {
 
         function sortMessageGroup(group) {
             var promise;
-            var msgs = group.msgs;
+            var msgInfos = group.msgInfos;
             if (key_is_exp) {
-                var evaluatedDataPromises = msgs.map(msg => {
+                var evaluatedDataPromises = msgInfos.map(mInfo => {
                     return new Promise((resolve,reject) => {
-                        RED.util.evaluateJSONataExpression(key_exp, msg, (err, result) => {
+                        RED.util.evaluateJSONataExpression(key_exp, mInfo.msg, (err, result) => {
                             if (err) {
                                 reject(RED._("sort.invalid-exp",{message:err.toString()}));
                             } else {
                                 resolve({
-                                    item: msg,
+                                    item: mInfo,
                                     sortValue: result
                                 })
                             }
@@ -106,20 +106,21 @@ module.exports = function(RED) {
                 var key = function(msg) {
                     return ;
                 }
-                var comp = generateComparisonFunction(msg => RED.util.getMessageProperty(msg, key_prop));
+                var comp = generateComparisonFunction(mInfo => RED.util.getMessageProperty(mInfo.msg, key_prop));
                 try {
-                    msgs.sort(comp);
+                    msgInfos.sort(comp);
                 }
                 catch (e) {
                     return; // not send when error
                 }
-                promise = Promise.resolve(msgs);
+                promise = Promise.resolve(msgInfos);
             }
-            return promise.then(msgs => {
-                for (var i = 0; i < msgs.length; i++) {
-                    var msg = msgs[i];
+            return promise.then(msgInfos => {
+                for (let i = 0; i < msgInfos.length; i++) {
+                    const msg = msgInfos[i].msg;
                     msg.parts.index = i;
-                    node.send(msg);
+                    msgInfos[i].send(msg);
+                    msgInfos[i].done();
                 }
             });
         }
@@ -181,65 +182,79 @@ module.exports = function(RED) {
                 }
             }
             if(oldest !== undefined) {
+                oldest.msgInfos[oldest.msgInfos.length - 1].done(RED._("sort.too-many"));
+                for (let i = 0; i < oldest.msgInfos.length - 1; i++) {
+                    oldest.msgInfos[i].done();
+                }
                 delete pending[oldest_key];
-                return oldest.msgs.length;
+                return oldest.msgInfos.length;
             }
             return 0;
         }
 
-        function processMessage(msg) {
+        function processMessage(msgInfo) {
+            const msg = msgInfo.msg;
             if (target_is_prop) {
                 sortMessageProperty(msg).then(send => {
                     if (send) {
-                        node.send(msg);
+                        msgInfo.send(msg);
                     }
+                    msgInfo.done();
                 }).catch(err => {
-                    node.error(err,msg);
+                    msgInfo.done(err);
                 });
                 return;
             }
             var parts = msg.parts;
             if (!parts || !parts.hasOwnProperty("id") || !parts.hasOwnProperty("index")) {
+                msgInfo.done();
                 return;
             }
             var gid = parts.id;
             if (!pending.hasOwnProperty(gid)) {
                 pending[gid] = {
                     count: undefined,
-                    msgs: [],
+                    msgInfos: [],
                     seq_no: pending_id++
                 };
             }
             var group = pending[gid];
-            var msgs = group.msgs;
-            msgs.push(msg);
+            var msgInfos = group.msgInfos;
+            msgInfos.push(msgInfo);
             if (parts.hasOwnProperty("count")) {
                 group.count = parts.count;
             }
             pending_count++;
-            if (group.count === msgs.length) {
+            if (group.count === msgInfos.length) {
                 delete pending[gid]
                 sortMessageGroup(group).catch(err => {
-                    node.error(err,msg);
+                    // throw an error for last message, and just call done() for remaining messages
+                    msgInfos[msgInfos.length-1].done(err);
+                    for (let i = 0; i < msgInfos.length - 1; i++) {
+                        msgInfos[i].done()
+                    };
                 });
-                pending_count -= msgs.length;
+                pending_count -= msgInfos.length;
             } else {
                 var max_msgs = max_kept_msgs_count(node);
                 if ((max_msgs > 0) && (pending_count > max_msgs)) {
                     pending_count -= removeOldestPending();
-                    node.error(RED._("sort.too-many"), msg);
                 }
             }
         }
 
-        this.on("input", function(msg) {
-            processMessage(msg);
+        this.on("input", function(msg, send, done) {
+            processMessage({msg, send, done});
         });
 
         this.on("close", function() {
             for(var key in pending) {
                 if (pending.hasOwnProperty(key)) {
-                    node.log(RED._("sort.clear"), pending[key].msgs[0]);
+                    node.log(RED._("sort.clear"), pending[key].msgInfos[0]);
+                    const group = pending[key];
+                    group.msgInfos.forEach(mInfo => {
+                        mInfo.done();
+                    });
                     delete pending[key];
                 }
             }
diff --git a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.js b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
index 77574f222..f3f29df6a 100644
--- a/packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
+++ b/packages/node_modules/@node-red/nodes/core/sequence/19-batch.js
@@ -32,11 +32,11 @@ module.exports = function(RED) {
         return _max_kept_msgs_count;
     }
 
-    function send_msgs(node, msgs, clone_msg) {
-        var count = msgs.length;
-        var msg_id = msgs[0]._msgid;
+    function send_msgs(node, msgInfos, clone_msg) {
+        var count = msgInfos.length;
+        var msg_id = msgInfos[0].msg._msgid;
         for (var i = 0; i < count; i++) {
-            var msg = clone_msg ? RED.util.cloneMessage(msgs[i]) : msgs[i];
+            var msg = clone_msg ? RED.util.cloneMessage(msgInfos[i].msg) : msgInfos[i].msg;
             if (!msg.hasOwnProperty("parts")) {
                 msg.parts = {};
             }
@@ -44,14 +44,16 @@ module.exports = function(RED) {
             parts.id = msg_id;
             parts.index = i;
             parts.count = count;
-            node.send(msg);
+            msgInfos[i].send(msg);
+            //msgInfos[i].done();
         }
     }
 
     function send_interval(node, allow_empty_seq) {
-        let msgs = node.pending;
-        if (msgs.length > 0) {
-            send_msgs(node, msgs, false);
+        let msgInfos = node.pending;
+        if (msgInfos.length > 0) {
+            send_msgs(node, msgInfos, false);
+            msgInfos.forEach(e => e.done());
             node.pending = [];
         }
         else {
@@ -108,19 +110,20 @@ module.exports = function(RED) {
                 return;
             }
         }
-        var msgs = [];
+        var msgInfos = [];
         for (var topic of topics) {
-            var t_msgs = get_msgs_of_topic(pending, topic);
-            msgs = msgs.concat(t_msgs);
+            var t_msgInfos = get_msgs_of_topic(pending, topic);
+            msgInfos = msgInfos.concat(t_msgInfos);
         }
         for (var topic of topics) {
             remove_topic(pending, topic);
         }
-        send_msgs(node, msgs, true);
-        node.pending_count -= msgs.length;
+        send_msgs(node, msgInfos, true);
+        msgInfos.forEach(e => e.done() );
+        node.pending_count -= msgInfos.length;
     }
 
-    function add_to_topic_group(pending, topic, gid, msg) {
+    function add_to_topic_group(pending, topic, gid, msgInfo) {
         if (!pending.hasOwnProperty(topic)) {
             pending[topic] = { groups: {}, gids: [] };
         }
@@ -132,32 +135,43 @@ module.exports = function(RED) {
             gids.push(gid);
         }
         var group = groups[gid];
-        group.msgs.push(msg);
+        group.msgs.push(msgInfo);
         if ((group.count === undefined) &&
-            msg.parts.hasOwnProperty('count')) {
-            group.count = msg.parts.count;
+            msgInfo.msg.parts.hasOwnProperty('count')) {
+            group.count = msgInfo.msg.parts.count;
         }
     }
 
-    function concat_msg(node, msg) {
+    function concat_msg(node, msg, send, done) {
         var topic = msg.topic;
         if(node.topics.indexOf(topic) >= 0) {
             if (!msg.hasOwnProperty("parts") ||
                 !msg.parts.hasOwnProperty("id") ||
                 !msg.parts.hasOwnProperty("index") ||
                 !msg.parts.hasOwnProperty("count")) {
-                node.error(RED._("batch.no-parts"), msg);
+                done(RED._("batch.no-parts"));
                 return;
             }
             var gid = msg.parts.id;
             var pending = node.pending;
-            add_to_topic_group(pending, topic, gid, msg);
+            add_to_topic_group(pending, topic, gid, {msg, send, done});
             node.pending_count++;
             var max_msgs = max_kept_msgs_count(node);
             if ((max_msgs > 0) && (node.pending_count > max_msgs)) {
+                Object.values(node.pending).forEach(p_topic => {
+                    Object.values(p_topic.groups).forEach(group => {
+                        group.msgs.forEach(msgInfo => {
+                            if (msgInfo.msg.id === msg.id) {
+                                // the message that caused the overflow
+                                msgInfo.done(RED._("batch.too-many"));
+                            } else {
+                                msgInfo.done();
+                            }
+                        })
+                    })
+                });
                 node.pending = {};
                 node.pending_count = 0;
-                node.error(RED._("batch.too-many"), msg);
             }
             try_concat(node, pending);
         }
@@ -178,29 +192,37 @@ module.exports = function(RED) {
                 return;
             }
             node.pending = [];
-            this.on("input", function(msg) {
+            this.on("input", function(msg, send, done) {
                 if (msg.hasOwnProperty("reset")) {
+                    node.pending.forEach(e => e.done());
                     node.pending = [];
                     node.pending_count = 0;
+                    done();
                     return;
                 }
                 var queue = node.pending;
-                queue.push(msg);
+                queue.push({msg, send, done});
                 node.pending_count++;
                 if (queue.length === count) {
                     send_msgs(node, queue, is_overlap);
+                    for (let i = 0; i < queue.length-overlap; i++) {
+                        queue[i].done();
+                    }
                     node.pending =
                         (overlap === 0) ? [] : queue.slice(-overlap);
                     node.pending_count = 0;
                 }
                 var max_msgs = max_kept_msgs_count(node);
                 if ((max_msgs > 0) && (node.pending_count > max_msgs)) {
+                    let lastMInfo = node.pending.pop();
+                    lastMInfo.done(RED._("batch.too-many"));
+                    node.pending.forEach(e => e.done());
                     node.pending = [];
                     node.pending_count = 0;
-                    node.error(RED._("batch.too-many"), msg);
                 }
             });
             this.on("close", function() {
+                node.pending.forEach(e=> e.done());
                 node.pending_count = 0;
                 node.pending = [];
             });
@@ -217,31 +239,36 @@ module.exports = function(RED) {
             if (interval > 0) {
                 timer = setInterval(msgHandler, interval);
             }
-            this.on("input", function(msg) {
+            this.on("input", function(msg, send, done) {
                 if (msg.hasOwnProperty("reset")) {
                     if (timer !== undefined) {
                         clearInterval(timer);
                     }
+                    node.pending.forEach(e => e.done());
                     node.pending = [];
                     node.pending_count = 0;
+                    done();
                     if (interval > 0) {
                         timer = setInterval(msgHandler, interval);
                     }
                     return;
                 }
-                node.pending.push(msg);
+                node.pending.push({msg, send, done});
                 node.pending_count++;
                 var max_msgs = max_kept_msgs_count(node);
                 if ((max_msgs > 0) && (node.pending_count > max_msgs)) {
+                    let lastMInfo = node.pending.pop();
+                    lastMInfo.done(RED._("batch.too-many"));
+                    node.pending.forEach(e => e.done());
                     node.pending = [];
                     node.pending_count = 0;
-                    node.error(RED._("batch.too-many"), msg);
                 }
             });
             this.on("close", function() {
                 if (timer !== undefined) {
                     clearInterval(timer);
                 }
+                node.pending.forEach(e => e.done());
                 node.pending = [];
                 node.pending_count = 0;
             });
@@ -251,15 +278,26 @@ module.exports = function(RED) {
                 return x.topic;
             });
             node.pending = {};
-            this.on("input", function(msg) {
+            this.on("input", function(msg, send, done) {
                 if (msg.hasOwnProperty("reset")) {
+                    Object.values(node.pending).forEach(p_topic => {
+                        Object.values(p_topic.groups).forEach(group => {
+                            group.msgs.forEach(e => e.done());
+                        });
+                    });
                     node.pending = {};
                     node.pending_count = 0;
+                    done();
                     return;
                 }
-                concat_msg(node, msg);
+                concat_msg(node, msg, send, done);
             });
             this.on("close", function() {
+                Object.values(node.pending).forEach(p_topic => {
+                    Object.values(p_topic.groups).forEach(group => {
+                        group.msgs.forEach(e => e.done());
+                    });
+                });
                 node.pending = {};
                 node.pending_count = 0;
             });
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/01 - Parse CSV with default column name as message sequence.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/01 - Parse CSV with default column name as message sequence.json
new file mode 100644
index 000000000..ed75294b1
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/01 - Parse CSV with default column name as message sequence.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "330f4888.cccb28",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 180,
+        "wires": [
+            [
+                "ed11f8d6.5e3c88"
+            ]
+        ]
+    },
+    {
+        "id": "a0288b44.71d488",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": "",
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 180,
+        "wires": [
+            [
+                "369cbe42.4af9f2"
+            ]
+        ]
+    },
+    {
+        "id": "ed11f8d6.5e3c88",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "CSV data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "text",
+        "syntax": "mustache",
+        "template": "Apple,100,Canada\nOrange,120,USA\nBanana,80,Philippines",
+        "output": "str",
+        "x": 430,
+        "y": 180,
+        "wires": [
+            [
+                "a0288b44.71d488"
+            ]
+        ]
+    },
+    {
+        "id": "369cbe42.4af9f2",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "783cfaa6.52fbe4",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Parse CSV with default column name as messages",
+        "info": "CSV node can parse input CSV data.\nParsed CSV record can be sent as a message sequence.\nEach message payload points to an object with `col`*N* as a key and CSV value as a value.\n",
+        "x": 330,
+        "y": 120,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/02 - Parse CSV with default column name as array.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/02 - Parse CSV with default column name as array.json
new file mode 100644
index 000000000..85a03e486
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/02 - Parse CSV with default column name as array.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "98c9d44d.4457b8",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 360,
+        "wires": [
+            [
+                "65476517.3d760c"
+            ]
+        ]
+    },
+    {
+        "id": "76df98f7.0dcd08",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": "",
+        "hdrout": "none",
+        "multi": "mult",
+        "ret": "\\n",
+        "temp": "",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 360,
+        "wires": [
+            [
+                "557979e0.e6b588"
+            ]
+        ]
+    },
+    {
+        "id": "65476517.3d760c",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "CSV data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "text",
+        "syntax": "mustache",
+        "template": "Apple,100,Canada\nOrange,120,USA\nBanana,80,Philippines",
+        "output": "str",
+        "x": 430,
+        "y": 360,
+        "wires": [
+            [
+                "76df98f7.0dcd08"
+            ]
+        ]
+    },
+    {
+        "id": "557979e0.e6b588",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 360,
+        "wires": []
+    },
+    {
+        "id": "187f4ab3.4c9ab5",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Parse CSV with default column name as array",
+        "info": "CSV node can send a single message with array of parsed CSV records.\nEach element of the array consists of objects with key-value pair.",
+        "x": 320,
+        "y": 300,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/03 - Parse CSV with specified column name as message sequence.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/03 - Parse CSV with specified column name as message sequence.json
new file mode 100644
index 000000000..327a25313
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/03 - Parse CSV with specified column name as message sequence.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "1216e95b.1b1e87",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 560,
+        "wires": [
+            [
+                "e41ffbbc.de2ed8"
+            ]
+        ]
+    },
+    {
+        "id": "286828bc.9233c8",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": "",
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price,origin",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 560,
+        "wires": [
+            [
+                "9d8218c.5550ee8"
+            ]
+        ]
+    },
+    {
+        "id": "e41ffbbc.de2ed8",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "CSV data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "text",
+        "syntax": "mustache",
+        "template": "Apple,100,Canada\nOrange,120,USA\nBanana,80,Philippines",
+        "output": "str",
+        "x": 430,
+        "y": 560,
+        "wires": [
+            [
+                "286828bc.9233c8"
+            ]
+        ]
+    },
+    {
+        "id": "9d8218c.5550ee8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 560,
+        "wires": []
+    },
+    {
+        "id": "aaa1ee8f.21e2c",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Parse CSV with specified column name as messages",
+        "info": "CSV node can specify column name of parsed objects in its settings panel.",
+        "x": 340,
+        "y": 500,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/04 - Parse CSV with column name in first row as message sequence.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/04 - Parse CSV with column name in first row as message sequence.json
new file mode 100644
index 000000000..e287b57e7
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/04 - Parse CSV with column name in first row as message sequence.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "24093558.0315aa",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 740,
+        "wires": [
+            [
+                "80abaee1.5fa7f"
+            ]
+        ]
+    },
+    {
+        "id": "d4d2ca3f.1d9488",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": true,
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 740,
+        "wires": [
+            [
+                "b52791c3.08967"
+            ]
+        ]
+    },
+    {
+        "id": "80abaee1.5fa7f",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "CSV data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "text",
+        "syntax": "mustache",
+        "template": "kind,price,origin\nApple,100,Canada\nOrange,120,USA\nBanana,80,Philippines",
+        "output": "str",
+        "x": 430,
+        "y": 740,
+        "wires": [
+            [
+                "d4d2ca3f.1d9488"
+            ]
+        ]
+    },
+    {
+        "id": "b52791c3.08967",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 740,
+        "wires": []
+    },
+    {
+        "id": "85091361.85644",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Parse CSV with column name in first row as messages",
+        "info": "CSV node can use first row of input CSV text as a column name of each record object.\n",
+        "x": 340,
+        "y": 680,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/05 - Convert JavaScript object to CSV.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/05 - Convert JavaScript object to CSV.json
new file mode 100644
index 000000000..a97656085
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/05 - Convert JavaScript object to CSV.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "9e93169c.b763a8",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert JavaScript object to CSV",
+        "info": "CSV node can convert a JavaScript object to CSV text.\nEach object contains key-value pair of specified properties.\n",
+        "x": 270,
+        "y": 860,
+        "wires": []
+    },
+    {
+        "id": "8ca41fee.3303d",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 920,
+        "wires": [
+            [
+                "c466905b.e8c61"
+            ]
+        ]
+    },
+    {
+        "id": "65146d20.d78204",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": false,
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 920,
+        "wires": [
+            [
+                "92e99e67.a37d8"
+            ]
+        ]
+    },
+    {
+        "id": "c466905b.e8c61",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": 100,\n    \"origin\": \"Canada\"\n}",
+        "output": "json",
+        "x": 430,
+        "y": 920,
+        "wires": [
+            [
+                "65146d20.d78204"
+            ]
+        ]
+    },
+    {
+        "id": "92e99e67.a37d8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 920,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/06 - Convert JavaScript object to CSV.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/06 - Convert JavaScript object to CSV.json
new file mode 100644
index 000000000..0266dbe49
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/06 - Convert JavaScript object to CSV.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "e89019c5.70ae78",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert array of JavaScript objects to CSV",
+        "info": "CSV node can convert an array of JavaScript objects to multi-line CSV text.",
+        "x": 300,
+        "y": 1020,
+        "wires": []
+    },
+    {
+        "id": "bd0d82ed.7b28",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 1080,
+        "wires": [
+            [
+                "1d857b8d.3a4014"
+            ]
+        ]
+    },
+    {
+        "id": "66a37667.16ebd8",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": false,
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 1080,
+        "wires": [
+            [
+                "859725fd.dc93d8"
+            ]
+        ]
+    },
+    {
+        "id": "1d857b8d.3a4014",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "[\n    {\n        \"kind\": \"Apple\",\n        \"price\": 100,\n        \"origin\": \"Canada\"\n    },\n    {\n        \"kind\": \"Orange\",\n        \"price\": 120,\n        \"origin\": \"USA\"\n    },\n    {\n        \"kind\": \"Banana\",\n        \"price\": 80,\n        \"origin\": \"Philippines\"\n    }\n]",
+        "output": "json",
+        "x": 430,
+        "y": 1080,
+        "wires": [
+            [
+                "66a37667.16ebd8"
+            ]
+        ]
+    },
+    {
+        "id": "859725fd.dc93d8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 1080,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/07 - Convert array of JavaScript objects to CSV with column name header.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/07 - Convert array of JavaScript objects to CSV with column name header.json
new file mode 100644
index 000000000..b1b337a06
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/07 - Convert array of JavaScript objects to CSV with column name header.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "2ebdd51e.c5d17a",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert array of JavaScript objects to CSV with column name header",
+        "info": "CSV node can convert an array of JavaScript objects to multi-line CSV text with column name header at first line.",
+        "x": 390,
+        "y": 1200,
+        "wires": []
+    },
+    {
+        "id": "2b4d538d.ada07c",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 1260,
+        "wires": [
+            [
+                "3e5c9e8.5065b62"
+            ]
+        ]
+    },
+    {
+        "id": "db02c7be.0984e8",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": false,
+        "hdrout": "all",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 1260,
+        "wires": [
+            [
+                "61f8b772.ddb1f8"
+            ]
+        ]
+    },
+    {
+        "id": "3e5c9e8.5065b62",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "[\n    {\n        \"kind\": \"Apple\",\n        \"price\": 100,\n        \"origin\": \"Canada\"\n    },\n    {\n        \"kind\": \"Orange\",\n        \"price\": 120,\n        \"origin\": \"USA\"\n    },\n    {\n        \"kind\": \"Banana\",\n        \"price\": 80,\n        \"origin\": \"Philippines\"\n    }\n]",
+        "output": "json",
+        "x": 430,
+        "y": 1260,
+        "wires": [
+            [
+                "db02c7be.0984e8"
+            ]
+        ]
+    },
+    {
+        "id": "61f8b772.ddb1f8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 1260,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/08 - Specify column names in input message.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/08 - Specify column names in input message.json
new file mode 100644
index 000000000..b1b337a06
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/08 - Specify column names in input message.json	
@@ -0,0 +1,99 @@
+[
+    {
+        "id": "2ebdd51e.c5d17a",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert array of JavaScript objects to CSV with column name header",
+        "info": "CSV node can convert an array of JavaScript objects to multi-line CSV text with column name header at first line.",
+        "x": 390,
+        "y": 1200,
+        "wires": []
+    },
+    {
+        "id": "2b4d538d.ada07c",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 1260,
+        "wires": [
+            [
+                "3e5c9e8.5065b62"
+            ]
+        ]
+    },
+    {
+        "id": "db02c7be.0984e8",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": false,
+        "hdrout": "all",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 1260,
+        "wires": [
+            [
+                "61f8b772.ddb1f8"
+            ]
+        ]
+    },
+    {
+        "id": "3e5c9e8.5065b62",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "[\n    {\n        \"kind\": \"Apple\",\n        \"price\": 100,\n        \"origin\": \"Canada\"\n    },\n    {\n        \"kind\": \"Orange\",\n        \"price\": 120,\n        \"origin\": \"USA\"\n    },\n    {\n        \"kind\": \"Banana\",\n        \"price\": 80,\n        \"origin\": \"Philippines\"\n    }\n]",
+        "output": "json",
+        "x": 430,
+        "y": 1260,
+        "wires": [
+            [
+                "db02c7be.0984e8"
+            ]
+        ]
+    },
+    {
+        "id": "61f8b772.ddb1f8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 780,
+        "y": 1260,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/09 - Send column name when reset property set.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/09 - Send column name when reset property set.json
new file mode 100644
index 000000000..81d9b4730
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/09 - Send column name when reset property set.json	
@@ -0,0 +1,200 @@
+[
+    {
+        "id": "1ae28939.9f5fc7",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Send column name when reset property set",
+        "info": "CSV node can send column names at first or `reset` property exists in input message.",
+        "x": 310,
+        "y": 1540,
+        "wires": []
+    },
+    {
+        "id": "c16ad95b.4f9ac8",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "Apple",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 250,
+        "y": 1600,
+        "wires": [
+            [
+                "7f7bfc72.aed104"
+            ]
+        ]
+    },
+    {
+        "id": "870620b9.95343",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": false,
+        "hdrout": "once",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 650,
+        "y": 1720,
+        "wires": [
+            [
+                "d960de42.619c7"
+            ]
+        ]
+    },
+    {
+        "id": "7f7bfc72.aed104",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": 100,\n    \"origin\": \"Canada\"\n}",
+        "output": "json",
+        "x": 470,
+        "y": 1600,
+        "wires": [
+            [
+                "870620b9.95343"
+            ]
+        ]
+    },
+    {
+        "id": "d960de42.619c7",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 830,
+        "y": 1720,
+        "wires": []
+    },
+    {
+        "id": "6f8296e.f95ca68",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "Orange",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 250,
+        "y": 1660,
+        "wires": [
+            [
+                "c37d0dfa.ec1ab"
+            ]
+        ]
+    },
+    {
+        "id": "c37d0dfa.ec1ab",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Orange\",\n    \"price\": 120,\n    \"origin\": \"USA\"\n}\n",
+        "output": "json",
+        "x": 470,
+        "y": 1660,
+        "wires": [
+            [
+                "870620b9.95343"
+            ]
+        ]
+    },
+    {
+        "id": "35209fe2.16926",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "Banana & reset",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            },
+            {
+                "p": "reset",
+                "v": "",
+                "vt": "date"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 280,
+        "y": 1720,
+        "wires": [
+            [
+                "afd4e6b3.624a28"
+            ]
+        ]
+    },
+    {
+        "id": "afd4e6b3.624a28",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Banana\",\n    \"price\": 80,\n    \"origin\": \"Philippines\"\n}",
+        "output": "json",
+        "x": 470,
+        "y": 1720,
+        "wires": [
+            [
+                "870620b9.95343"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/csv/10 - Join parsed CSV message sequence using join node.json b/packages/node_modules/@node-red/nodes/examples/parser/csv/10 - Join parsed CSV message sequence using join node.json
new file mode 100644
index 000000000..87036d8ee
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/csv/10 - Join parsed CSV message sequence using join node.json	
@@ -0,0 +1,150 @@
+[
+    {
+        "id": "195c168c.44f149",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 260,
+        "y": 1900,
+        "wires": [
+            [
+                "b270564c.171908"
+            ]
+        ]
+    },
+    {
+        "id": "8ec8cf9e.103fa",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": true,
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 600,
+        "y": 1900,
+        "wires": [
+            [
+                "5c5254a8.bc562c"
+            ]
+        ]
+    },
+    {
+        "id": "b270564c.171908",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "CSV data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "text",
+        "syntax": "mustache",
+        "template": "kind,price,origin\nApple,100,Canada\nOrange,120,USA\nBanana,80,Philippines",
+        "output": "str",
+        "x": 430,
+        "y": 1900,
+        "wires": [
+            [
+                "8ec8cf9e.103fa"
+            ]
+        ]
+    },
+    {
+        "id": "1c7be442.6a4bdc",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 1090,
+        "y": 1900,
+        "wires": []
+    },
+    {
+        "id": "d3da7cfb.cf596",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Join parsed CSV message sequence using join node",
+        "info": "Parset CSV message sequence can be joined by join node.",
+        "x": 330,
+        "y": 1840,
+        "wires": []
+    },
+    {
+        "id": "a07c9e26.c84fd",
+        "type": "csv",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "sep": ",",
+        "hdrin": "",
+        "hdrout": "none",
+        "multi": "one",
+        "ret": "\\n",
+        "temp": "kind,price",
+        "skip": "0",
+        "strings": true,
+        "include_empty_strings": "",
+        "include_null_values": "",
+        "x": 910,
+        "y": 1900,
+        "wires": [
+            [
+                "1c7be442.6a4bdc"
+            ]
+        ]
+    },
+    {
+        "id": "5c5254a8.bc562c",
+        "type": "join",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "mode": "auto",
+        "build": "string",
+        "property": "payload",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 750,
+        "y": 1900,
+        "wires": [
+            [
+                "a07c9e26.c84fd"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/html/01 - Extract array of HTML element by CSS selector.json b/packages/node_modules/@node-red/nodes/examples/parser/html/01 - Extract array of HTML element by CSS selector.json
new file mode 100644
index 000000000..14ef21214
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/html/01 - Extract array of HTML element by CSS selector.json	
@@ -0,0 +1,94 @@
+[
+    {
+        "id": "8c5224a6.201b88",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 180,
+        "wires": [
+            [
+                "d6c67e51.0d709"
+            ]
+        ]
+    },
+    {
+        "id": "d6c67e51.0d709",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "HTML text",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "plain",
+        "template": "<html>\n    <head>\n        <title>List of Fruits</title>\n    </head>\n    <body>\n        <ul>\n            <li class=\"Item\">Apple</li>\n            <li class=\"Item\">Orange</li>\n            <li class=\"Item\">Banana</li>\n        </ul>\n    </body>\n</html>\n",
+        "output": "str",
+        "x": 390,
+        "y": 180,
+        "wires": [
+            [
+                "599a1155.61a5c"
+            ]
+        ]
+    },
+    {
+        "id": "b0d5cd89.338df",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Extract array of HTML element by CSS selector",
+        "info": "HTML node can be used to extract elements in HTML document as an array using CSS selector.",
+        "x": 280,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "599a1155.61a5c",
+        "type": "html",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "outproperty": "payload",
+        "tag": ".Item",
+        "ret": "html",
+        "as": "single",
+        "x": 550,
+        "y": 180,
+        "wires": [
+            [
+                "942b23d1.cce09"
+            ]
+        ]
+    },
+    {
+        "id": "942b23d1.cce09",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 710,
+        "y": 180,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/html/02 - Extract sequence of HTML element by CSS selector.json b/packages/node_modules/@node-red/nodes/examples/parser/html/02 - Extract sequence of HTML element by CSS selector.json
new file mode 100644
index 000000000..ccd3bc782
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/html/02 - Extract sequence of HTML element by CSS selector.json	
@@ -0,0 +1,94 @@
+[
+    {
+        "id": "a44973e8.6319b",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 360,
+        "wires": [
+            [
+                "de1b012e.96ec3"
+            ]
+        ]
+    },
+    {
+        "id": "de1b012e.96ec3",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "HTML text",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "plain",
+        "template": "<html>\n    <head>\n        <title>List of Fruits</title>\n    </head>\n    <body>\n        <ul>\n            <li class=\"Item\">Apple</li>\n            <li class=\"Item\">Orange</li>\n            <li class=\"Item\">Banana</li>\n        </ul>\n    </body>\n</html>\n",
+        "output": "str",
+        "x": 390,
+        "y": 360,
+        "wires": [
+            [
+                "cee70712.6f3538"
+            ]
+        ]
+    },
+    {
+        "id": "99e32bc7.c8e508",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Extract sequence of HTML element by CSS selector",
+        "info": "HTML node can be used to extract elements in HTML document as a messege sequence using CSS selector.",
+        "x": 290,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "cee70712.6f3538",
+        "type": "html",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "outproperty": "payload",
+        "tag": ".Item",
+        "ret": "html",
+        "as": "multi",
+        "x": 550,
+        "y": 360,
+        "wires": [
+            [
+                "17f25482.d4b56b"
+            ]
+        ]
+    },
+    {
+        "id": "17f25482.d4b56b",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 710,
+        "y": 360,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/html/03 - Extract array of HTML element by CSS selector specified in message.json b/packages/node_modules/@node-red/nodes/examples/parser/html/03 - Extract array of HTML element by CSS selector specified in message.json
new file mode 100644
index 000000000..ad2400ef6
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/html/03 - Extract array of HTML element by CSS selector specified in message.json	
@@ -0,0 +1,121 @@
+[
+    {
+        "id": "653ce9aa.b6a1c8",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 560,
+        "wires": [
+            [
+                "52a16f7f.447d8"
+            ]
+        ]
+    },
+    {
+        "id": "52a16f7f.447d8",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "HTML text",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "plain",
+        "template": "<html>\n    <head>\n        <title>List of Fruits</title>\n    </head>\n    <body>\n        <ul>\n            <li class=\"Item\">Apple</li>\n            <li class=\"Item\">Orange</li>\n            <li class=\"Item\">Banana</li>\n        </ul>\n    </body>\n</html>\n",
+        "output": "str",
+        "x": 390,
+        "y": 560,
+        "wires": [
+            [
+                "a52319c3.89b008"
+            ]
+        ]
+    },
+    {
+        "id": "8bc35379.31d99",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Extract array of HTML element by CSS selector specified in message",
+        "info": "CSS selector for HTML node can be specified by `select` property of input message.",
+        "x": 350,
+        "y": 500,
+        "wires": []
+    },
+    {
+        "id": "9c49de8a.bad25",
+        "type": "html",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "outproperty": "payload",
+        "tag": "",
+        "ret": "html",
+        "as": "single",
+        "x": 730,
+        "y": 560,
+        "wires": [
+            [
+                "d4f4b987.278a68"
+            ]
+        ]
+    },
+    {
+        "id": "d4f4b987.278a68",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 890,
+        "y": 560,
+        "wires": []
+    },
+    {
+        "id": "a52319c3.89b008",
+        "type": "change",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "select",
+                "pt": "msg",
+                "to": ".Item",
+                "tot": "str"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 560,
+        "y": 560,
+        "wires": [
+            [
+                "9c49de8a.bad25"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/html/04 - Join extracedt  sequence of HTML element using join node.json b/packages/node_modules/@node-red/nodes/examples/parser/html/04 - Join extracedt  sequence of HTML element using join node.json
new file mode 100644
index 000000000..6a08486b9
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/html/04 - Join extracedt  sequence of HTML element using join node.json	
@@ -0,0 +1,122 @@
+[
+    {
+        "id": "66cff4ee.f2761c",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 760,
+        "wires": [
+            [
+                "2baaf6bf.0a02ca"
+            ]
+        ]
+    },
+    {
+        "id": "2baaf6bf.0a02ca",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "HTML text",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "plain",
+        "template": "<html>\n    <head>\n        <title>List of Fruits</title>\n    </head>\n    <body>\n        <ul>\n            <li class=\"Item\">Apple</li>\n            <li class=\"Item\">Orange</li>\n            <li class=\"Item\">Banana</li>\n        </ul>\n    </body>\n</html>\n",
+        "output": "str",
+        "x": 390,
+        "y": 760,
+        "wires": [
+            [
+                "bbb22e6b.0fa25"
+            ]
+        ]
+    },
+    {
+        "id": "a57d35d0.8aa538",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Join extracted  sequence of HTML element using join node",
+        "info": "Message sequence extracted by HTML node can be combined using join node.",
+        "x": 310,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "bbb22e6b.0fa25",
+        "type": "html",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "outproperty": "payload",
+        "tag": ".Item",
+        "ret": "html",
+        "as": "multi",
+        "x": 550,
+        "y": 760,
+        "wires": [
+            [
+                "bd01ca4.966ad38"
+            ]
+        ]
+    },
+    {
+        "id": "4d2616a8.84de88",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 850,
+        "y": 760,
+        "wires": []
+    },
+    {
+        "id": "bd01ca4.966ad38",
+        "type": "join",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "mode": "custom",
+        "build": "string",
+        "property": "payload",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": ",",
+        "joinerType": "str",
+        "accumulate": false,
+        "timeout": "",
+        "count": "",
+        "reduceRight": false,
+        "reduceExp": "",
+        "reduceInit": "",
+        "reduceInitType": "",
+        "reduceFixup": "",
+        "x": 690,
+        "y": 760,
+        "wires": [
+            [
+                "4d2616a8.84de88"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/json/01 - Convert JSON string to JavaScript object.json b/packages/node_modules/@node-red/nodes/examples/parser/json/01 - Convert JSON string to JavaScript object.json
new file mode 100644
index 000000000..c95e71a7d
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/json/01 - Convert JSON string to JavaScript object.json	
@@ -0,0 +1,92 @@
+[
+    {
+        "id": "9976e95d.2f8398",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 240,
+        "y": 180,
+        "wires": [
+            [
+                "d94fc083.49d87"
+            ]
+        ]
+    },
+    {
+        "id": "6684abb1.8eb454",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert JSON string to JS object",
+        "info": "JSON node can convert JSON string to JavaScript object.",
+        "x": 250,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "d94fc083.49d87",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JSON string",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": 100,\n    \"origin\": \"Canada\"\n}",
+        "output": "str",
+        "x": 410,
+        "y": 180,
+        "wires": [
+            [
+                "1a3dc54a.78598b"
+            ]
+        ]
+    },
+    {
+        "id": "8950a55d.023988",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 730,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "1a3dc54a.78598b",
+        "type": "json",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "action": "",
+        "pretty": false,
+        "x": 570,
+        "y": 180,
+        "wires": [
+            [
+                "8950a55d.023988"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/json/02 - Convert JavaScript object to JSON string.json b/packages/node_modules/@node-red/nodes/examples/parser/json/02 - Convert JavaScript object to JSON string.json
new file mode 100644
index 000000000..a10cc75b9
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/json/02 - Convert JavaScript object to JSON string.json	
@@ -0,0 +1,92 @@
+[
+    {
+        "id": "cb13761f.56c328",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 240,
+        "y": 380,
+        "wires": [
+            [
+                "c607642a.78c3c8"
+            ]
+        ]
+    },
+    {
+        "id": "180b1e22.0074e2",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert JS object to JSON string",
+        "info": "JSON node can convert JavaScript object to JSON string.",
+        "x": 250,
+        "y": 320,
+        "wires": []
+    },
+    {
+        "id": "c607642a.78c3c8",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": 100,\n    \"origin\": \"Canada\"\n}",
+        "output": "json",
+        "x": 400,
+        "y": 380,
+        "wires": [
+            [
+                "bf309844.fa12e8"
+            ]
+        ]
+    },
+    {
+        "id": "5b6b130b.72a14c",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 730,
+        "y": 380,
+        "wires": []
+    },
+    {
+        "id": "bf309844.fa12e8",
+        "type": "json",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "action": "",
+        "pretty": false,
+        "x": 570,
+        "y": 380,
+        "wires": [
+            [
+                "5b6b130b.72a14c"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/json/03 - Validate input JSON string.json b/packages/node_modules/@node-red/nodes/examples/parser/json/03 - Validate input JSON string.json
new file mode 100644
index 000000000..6271f00c6
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/json/03 - Validate input JSON string.json	
@@ -0,0 +1,160 @@
+[
+    {
+        "id": "2b18621b.e2670e",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "OK",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 230,
+        "y": 580,
+        "wires": [
+            [
+                "5986faee.aef954"
+            ]
+        ]
+    },
+    {
+        "id": "59acf99.9a92308",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Validate input JSON string",
+        "info": "JSON node can validate input JSON string using [JSON schema](https://json-schema.org/) when converting to JavaScript object.",
+        "x": 230,
+        "y": 520,
+        "wires": []
+    },
+    {
+        "id": "5986faee.aef954",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JSON string",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": 100,\n    \"origin\": \"Canada\"\n}",
+        "output": "str",
+        "x": 410,
+        "y": 580,
+        "wires": [
+            [
+                "f8a67c6d.4f1f1"
+            ]
+        ]
+    },
+    {
+        "id": "ca27c92c.ad7cb8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 910,
+        "y": 580,
+        "wires": []
+    },
+    {
+        "id": "2fad9978.ea1916",
+        "type": "json",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "action": "",
+        "pretty": false,
+        "x": 750,
+        "y": 580,
+        "wires": [
+            [
+                "ca27c92c.ad7cb8"
+            ]
+        ]
+    },
+    {
+        "id": "f8a67c6d.4f1f1",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "Schema",
+        "field": "schema",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"type\": \"object\",\n    \"properties\": {\n        \"kind\": {\n            \"type\": \"string\"\n        },\n        \"price\": {\n            \"type\": \"number\"\n        },\n        \"origin\": {\n            \"type\": \"string\"\n        }\n    }\n}",
+        "output": "json",
+        "x": 590,
+        "y": 580,
+        "wires": [
+            [
+                "2fad9978.ea1916"
+            ]
+        ]
+    },
+    {
+        "id": "8337e847.ac18d8",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "NG",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 230,
+        "y": 660,
+        "wires": [
+            [
+                "fa14d8bf.1ac938"
+            ]
+        ]
+    },
+    {
+        "id": "fa14d8bf.1ac938",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JSON string",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": \"100\",\n    \"origin\": \"Canada\"\n}",
+        "output": "str",
+        "x": 410,
+        "y": 660,
+        "wires": [
+            [
+                "f8a67c6d.4f1f1"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/xml/01 - Convert JavaScript object to XML.json b/packages/node_modules/@node-red/nodes/examples/parser/xml/01 - Convert JavaScript object to XML.json
new file mode 100644
index 000000000..3a97c8498
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/xml/01 - Convert JavaScript object to XML.json	
@@ -0,0 +1,92 @@
+[
+    {
+        "id": "82f1bd0b.43474",
+        "type": "xml",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "attr": "",
+        "chr": "",
+        "x": 530,
+        "y": 180,
+        "wires": [
+            [
+                "1cd4ad02.9a5423"
+            ]
+        ]
+    },
+    {
+        "id": "84222b92.d65d18",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 180,
+        "wires": [
+            [
+                "cdd1c154.3a655"
+            ]
+        ]
+    },
+    {
+        "id": "7b014430.dfd94c",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert JavaScript object to XML",
+        "info": "XML node can convert JavaScript object to XML string.",
+        "x": 240,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "1cd4ad02.9a5423",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 690,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "cdd1c154.3a655",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"kind\": \"Apple\",\n    \"price\": 100,\n    \"origin\": \"Canada\"\n}",
+        "output": "json",
+        "x": 360,
+        "y": 180,
+        "wires": [
+            [
+                "82f1bd0b.43474"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/xml/02 - Convert XML to JavaScript object.json b/packages/node_modules/@node-red/nodes/examples/parser/xml/02 - Convert XML to JavaScript object.json
new file mode 100644
index 000000000..5e46428ef
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/xml/02 - Convert XML to JavaScript object.json	
@@ -0,0 +1,92 @@
+[
+    {
+        "id": "93e423a9.a407d",
+        "type": "xml",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "attr": "",
+        "chr": "",
+        "x": 530,
+        "y": 360,
+        "wires": [
+            [
+                "2d0dde7e.a50082"
+            ]
+        ]
+    },
+    {
+        "id": "ba1dab90.8d1da8",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 360,
+        "wires": [
+            [
+                "16617f26.14ced1"
+            ]
+        ]
+    },
+    {
+        "id": "a9f97b00.57d658",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert XML to JavaScript object",
+        "info": "XML node can convert XML string to JavaScript object.",
+        "x": 240,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "2d0dde7e.a50082",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 690,
+        "y": 360,
+        "wires": []
+    },
+    {
+        "id": "16617f26.14ced1",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "XML string",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "html",
+        "syntax": "plain",
+        "template": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<fruit id=\"100\">\n    <kind>Apple</kind>\n    <price>100</price>\n    <origin>Canada</origin>\n</fruit>",
+        "output": "str",
+        "x": 370,
+        "y": 360,
+        "wires": [
+            [
+                "93e423a9.a407d"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/xml/03 - Control conversion using options property.json b/packages/node_modules/@node-red/nodes/examples/parser/xml/03 - Control conversion using options property.json
new file mode 100644
index 000000000..7a3c39f7e
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/xml/03 - Control conversion using options property.json	
@@ -0,0 +1,119 @@
+[
+    {
+        "id": "581bd648.636628",
+        "type": "xml",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "property": "payload",
+        "attr": "",
+        "chr": "",
+        "x": 710,
+        "y": 540,
+        "wires": [
+            [
+                "b74237dc.1e5028"
+            ]
+        ]
+    },
+    {
+        "id": "d0899f9b.f1ac6",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 540,
+        "wires": [
+            [
+                "f04ffb9a.68edb8"
+            ]
+        ]
+    },
+    {
+        "id": "8a214c05.dc61f",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Control conversion using options property",
+        "info": "XML node can control conversion by setting `options` property (defined by [xml2js](https://github.com/Leonidas-from-XIV/node-xml2js/blob/master/README.md#options)) in input message.",
+        "x": 260,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "b74237dc.1e5028",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 870,
+        "y": 540,
+        "wires": []
+    },
+    {
+        "id": "f04ffb9a.68edb8",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "XML string",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "html",
+        "syntax": "plain",
+        "template": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<fruit id=\"100\">\n    <kind>Apple</kind>\n    <price>100</price>\n    <origin>Canada</origin>\n</fruit>",
+        "output": "str",
+        "x": 370,
+        "y": 540,
+        "wires": [
+            [
+                "fedf79.5889c088"
+            ]
+        ]
+    },
+    {
+        "id": "fedf79.5889c088",
+        "type": "change",
+        "z": "4b63452d.672afc",
+        "name": "set options",
+        "rules": [
+            {
+                "t": "set",
+                "p": "options",
+                "pt": "msg",
+                "to": "{\"explicitArray\":false}",
+                "tot": "json"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 550,
+        "y": 540,
+        "wires": [
+            [
+                "581bd648.636628"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/yaml/01 - Convert JavaScript object to YAML.json b/packages/node_modules/@node-red/nodes/examples/parser/yaml/01 - Convert JavaScript object to YAML.json
new file mode 100644
index 000000000..d751a8731
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/yaml/01 - Convert JavaScript object to YAML.json	
@@ -0,0 +1,90 @@
+[
+    {
+        "id": "84222b92.d65d18",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 180,
+        "wires": [
+            [
+                "cdd1c154.3a655"
+            ]
+        ]
+    },
+    {
+        "id": "7b014430.dfd94c",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert JavaScript object to YAML",
+        "info": "YAML node can convert JavaScript object to YAML string.",
+        "x": 240,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "1cd4ad02.9a5423",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 670,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "cdd1c154.3a655",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "JS object",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "json",
+        "syntax": "plain",
+        "template": "{\n    \"fruits\" : {\n        \"kind\": \"Apple\",\n        \"price\": 100,\n        \"origin\": \"Canada\"\n    }\n}",
+        "output": "json",
+        "x": 360,
+        "y": 180,
+        "wires": [
+            [
+                "aaf0100b.16628"
+            ]
+        ]
+    },
+    {
+        "id": "aaf0100b.16628",
+        "type": "yaml",
+        "z": "4b63452d.672afc",
+        "property": "payload",
+        "name": "",
+        "x": 510,
+        "y": 180,
+        "wires": [
+            [
+                "1cd4ad02.9a5423"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/parser/yaml/02 - Convert YAML to JavaScript object.json b/packages/node_modules/@node-red/nodes/examples/parser/yaml/02 - Convert YAML to JavaScript object.json
new file mode 100644
index 000000000..d80e0d144
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/parser/yaml/02 - Convert YAML to JavaScript object.json	
@@ -0,0 +1,90 @@
+[
+    {
+        "id": "ba1dab90.8d1da8",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 200,
+        "y": 360,
+        "wires": [
+            [
+                "16617f26.14ced1"
+            ]
+        ]
+    },
+    {
+        "id": "a9f97b00.57d658",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Convert YAML to JavaScript object",
+        "info": "YAML node can convert YAML string to JavaScript object.",
+        "x": 240,
+        "y": 300,
+        "wires": []
+    },
+    {
+        "id": "2d0dde7e.a50082",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 690,
+        "y": 360,
+        "wires": []
+    },
+    {
+        "id": "16617f26.14ced1",
+        "type": "template",
+        "z": "4b63452d.672afc",
+        "name": "YAML string",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "yaml",
+        "syntax": "plain",
+        "template": "fruits:\n    kind: Apple\n    price: 100\n    origin: Canada",
+        "output": "str",
+        "x": 370,
+        "y": 360,
+        "wires": [
+            [
+                "e2e4f862.f9d7d8"
+            ]
+        ]
+    },
+    {
+        "id": "e2e4f862.f9d7d8",
+        "type": "yaml",
+        "z": "4b63452d.672afc",
+        "property": "payload",
+        "name": "",
+        "x": 530,
+        "y": 360,
+        "wires": [
+            [
+                "2d0dde7e.a50082"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file-in/01 - Read string from a file.json b/packages/node_modules/@node-red/nodes/examples/storage/file-in/01 - Read string from a file.json
new file mode 100644
index 000000000..14d7152c7
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/01 - Read string from a file.json	
@@ -0,0 +1,113 @@
+[
+    {
+        "id": "84222b92.d65d18",
+        "type": "inject",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "Hello, World!",
+        "payloadType": "str",
+        "x": 230,
+        "y": 220,
+        "wires": [
+            [
+                "b4b9f603.739598"
+            ]
+        ]
+    },
+    {
+        "id": "7b014430.dfd94c",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "Write string to a file, then read from the file",
+        "info": "File-in node can read string from a file.",
+        "x": 260,
+        "y": 140,
+        "wires": []
+    },
+    {
+        "id": "b4b9f603.739598",
+        "type": "file",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 420,
+        "y": 220,
+        "wires": [
+            [
+                "6dc01cac.5c4bf4"
+            ]
+        ]
+    },
+    {
+        "id": "2587adb9.7e60f2",
+        "type": "debug",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 810,
+        "y": 220,
+        "wires": []
+    },
+    {
+        "id": "6dc01cac.5c4bf4",
+        "type": "file in",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "utf8",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "none",
+        "x": 620,
+        "y": 220,
+        "wires": [
+            [
+                "2587adb9.7e60f2"
+            ]
+        ]
+    },
+    {
+        "id": "f4b4309a.3b78a",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↑read result from file",
+        "info": "",
+        "x": 630,
+        "y": 260,
+        "wires": []
+    },
+    {
+        "id": "672d3693.3cabd8",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↓write to /tmp/hello.txt",
+        "info": "",
+        "x": 440,
+        "y": 180,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file-in/02 - Read data in specified encoding.json b/packages/node_modules/@node-red/nodes/examples/storage/file-in/02 - Read data in specified encoding.json
new file mode 100644
index 000000000..d96623fb1
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/02 - Read data in specified encoding.json	
@@ -0,0 +1,113 @@
+[
+    {
+        "id": "8997398f.c5d628",
+        "type": "inject",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "😀",
+        "payloadType": "str",
+        "x": 210,
+        "y": 480,
+        "wires": [
+            [
+                "56e32d23.050f44"
+            ]
+        ]
+    },
+    {
+        "id": "4e598e65.1799d",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "Read data in specified encoding",
+        "info": "File-in node can specify encoding of data read from a file.",
+        "x": 230,
+        "y": 400,
+        "wires": []
+    },
+    {
+        "id": "56e32d23.050f44",
+        "type": "file",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 380,
+        "y": 480,
+        "wires": [
+            [
+                "38fa0579.f2cd8a"
+            ]
+        ]
+    },
+    {
+        "id": "d28c8994.99c0a8",
+        "type": "debug",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 770,
+        "y": 480,
+        "wires": []
+    },
+    {
+        "id": "38fa0579.f2cd8a",
+        "type": "file in",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "utf8",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "base64",
+        "x": 580,
+        "y": 480,
+        "wires": [
+            [
+                "d28c8994.99c0a8"
+            ]
+        ]
+    },
+    {
+        "id": "fa22ca20.ae4528",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↑read data from file as base64 string",
+        "info": "",
+        "x": 640,
+        "y": 520,
+        "wires": []
+    },
+    {
+        "id": "148e25ad.98891a",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↓write to /tmp/hello.txt",
+        "info": "",
+        "x": 400,
+        "y": 440,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file-in/03 - Read data breaking lines into messages.json b/packages/node_modules/@node-red/nodes/examples/storage/file-in/03 - Read data breaking lines into messages.json
new file mode 100644
index 000000000..b3d35a4da
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/03 - Read data breaking lines into messages.json	
@@ -0,0 +1,132 @@
+[
+    {
+        "id": "6a0b1d03.d4cee4",
+        "type": "inject",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 740,
+        "wires": [
+            [
+                "d4b00cb7.a5a23"
+            ]
+        ]
+    },
+    {
+        "id": "f17ea1d1.8ecc3",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "Read data breaking lines into individual messages",
+        "info": "File-in node can break read text into messages with individual lines",
+        "x": 290,
+        "y": 660,
+        "wires": []
+    },
+    {
+        "id": "99ae7806.1d6428",
+        "type": "file",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 540,
+        "y": 740,
+        "wires": [
+            [
+                "70d7892f.d27db8"
+            ]
+        ]
+    },
+    {
+        "id": "7ed8282c.92b338",
+        "type": "debug",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 810,
+        "y": 800,
+        "wires": []
+    },
+    {
+        "id": "70d7892f.d27db8",
+        "type": "file in",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "lines",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "none",
+        "x": 620,
+        "y": 800,
+        "wires": [
+            [
+                "7ed8282c.92b338"
+            ]
+        ]
+    },
+    {
+        "id": "c1b7e05.1d94b2",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↑read data from file breaking lines into messages",
+        "info": "",
+        "x": 720,
+        "y": 840,
+        "wires": []
+    },
+    {
+        "id": "a5f647b2.cf27a8",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↓write to /tmp/hello.txt",
+        "info": "",
+        "x": 560,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "d4b00cb7.a5a23",
+        "type": "template",
+        "z": "194a3e4f.a92772",
+        "name": "data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "plain",
+        "template": "one\ntwo\nthree!",
+        "output": "str",
+        "x": 370,
+        "y": 740,
+        "wires": [
+            [
+                "99ae7806.1d6428"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file-in/04 - Create a message stream.json b/packages/node_modules/@node-red/nodes/examples/storage/file-in/04 - Create a message stream.json
new file mode 100644
index 000000000..18b462755
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file-in/04 - Create a message stream.json	
@@ -0,0 +1,201 @@
+[
+    {
+        "id": "bdd57acc.2edc48",
+        "type": "inject",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 1040,
+        "wires": [
+            [
+                "7a069b01.0c2324"
+            ]
+        ]
+    },
+    {
+        "id": "1fd12220.33953e",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "Creating a message stream from lines of data",
+        "info": "File-in node can break read text into messages with individual lines.  The messages creates a stream of messages.",
+        "x": 270,
+        "y": 960,
+        "wires": []
+    },
+    {
+        "id": "ab6eb213.2a08d",
+        "type": "file",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 540,
+        "y": 1040,
+        "wires": [
+            [
+                "b7ed49b0.649fb8"
+            ]
+        ]
+    },
+    {
+        "id": "c48d8ae0.9ff3a8",
+        "type": "debug",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 810,
+        "y": 1140,
+        "wires": []
+    },
+    {
+        "id": "b7ed49b0.649fb8",
+        "type": "file in",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "lines",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "none",
+        "x": 280,
+        "y": 1140,
+        "wires": [
+            [
+                "83073ebe.fcce4"
+            ]
+        ]
+    },
+    {
+        "id": "3c33e69f.6a04ba",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↑read data from file breaking lines into messages",
+        "info": "",
+        "x": 380,
+        "y": 1180,
+        "wires": []
+    },
+    {
+        "id": "3598bf7d.5712a",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↓write to /tmp/hello.txt",
+        "info": "",
+        "x": 560,
+        "y": 1000,
+        "wires": []
+    },
+    {
+        "id": "7a069b01.0c2324",
+        "type": "template",
+        "z": "194a3e4f.a92772",
+        "name": "data",
+        "field": "payload",
+        "fieldType": "msg",
+        "format": "handlebars",
+        "syntax": "plain",
+        "template": "Apple\nBanana\nGrape\nOrange",
+        "output": "str",
+        "x": 370,
+        "y": 1040,
+        "wires": [
+            [
+                "ab6eb213.2a08d"
+            ]
+        ]
+    },
+    {
+        "id": "8d4ed1d0.821fe",
+        "type": "join",
+        "z": "194a3e4f.a92772",
+        "name": "",
+        "mode": "auto",
+        "build": "string",
+        "property": "payload",
+        "propertyType": "msg",
+        "key": "topic",
+        "joiner": "\\n",
+        "joinerType": "str",
+        "accumulate": "false",
+        "timeout": "",
+        "count": "",
+        "reduceRight": false,
+        "x": 630,
+        "y": 1140,
+        "wires": [
+            [
+                "c48d8ae0.9ff3a8"
+            ]
+        ]
+    },
+    {
+        "id": "83073ebe.fcce4",
+        "type": "switch",
+        "z": "194a3e4f.a92772",
+        "name": "< D",
+        "property": "payload",
+        "propertyType": "msg",
+        "rules": [
+            {
+                "t": "lt",
+                "v": "D",
+                "vt": "str"
+            }
+        ],
+        "checkall": "true",
+        "repair": true,
+        "outputs": 1,
+        "x": 470,
+        "y": 1140,
+        "wires": [
+            [
+                "8d4ed1d0.821fe"
+            ]
+        ]
+    },
+    {
+        "id": "2088e195.f7aebe",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↓filter data before \"D\"",
+        "info": "",
+        "x": 520,
+        "y": 1100,
+        "wires": []
+    },
+    {
+        "id": "b848cdc7.61e06",
+        "type": "comment",
+        "z": "194a3e4f.a92772",
+        "name": "↑join to single string",
+        "info": "",
+        "x": 670,
+        "y": 1180,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file/01 - Write string to a file.json b/packages/node_modules/@node-red/nodes/examples/storage/file/01 - Write string to a file.json
new file mode 100644
index 000000000..2be033021
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/01 - Write string to a file.json	
@@ -0,0 +1,113 @@
+[
+    {
+        "id": "84222b92.d65d18",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "Hello, World!",
+        "payloadType": "str",
+        "x": 230,
+        "y": 200,
+        "wires": [
+            [
+                "b4b9f603.739598"
+            ]
+        ]
+    },
+    {
+        "id": "7b014430.dfd94c",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Write string to a file, then read from the file",
+        "info": "File node can write string to a file.",
+        "x": 260,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "b4b9f603.739598",
+        "type": "file",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 420,
+        "y": 200,
+        "wires": [
+            [
+                "6dc01cac.5c4bf4"
+            ]
+        ]
+    },
+    {
+        "id": "2587adb9.7e60f2",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 810,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "6dc01cac.5c4bf4",
+        "type": "file in",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "utf8",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "none",
+        "x": 620,
+        "y": 200,
+        "wires": [
+            [
+                "2587adb9.7e60f2"
+            ]
+        ]
+    },
+    {
+        "id": "f4b4309a.3b78a",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↑read result from file",
+        "info": "",
+        "x": 630,
+        "y": 240,
+        "wires": []
+    },
+    {
+        "id": "672d3693.3cabd8",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↓write to /tmp/hello.txt",
+        "info": "",
+        "x": 440,
+        "y": 160,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file/02 - Write string to a file specified by property.json b/packages/node_modules/@node-red/nodes/examples/storage/file/02 - Write string to a file specified by property.json
new file mode 100644
index 000000000..6aaff500a
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/02 - Write string to a file specified by property.json	
@@ -0,0 +1,118 @@
+[
+    {
+        "id": "704479e1.399388",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "filename",
+                "v": "/tmp/hello.txt",
+                "vt": "str"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "Hello, World!",
+        "payloadType": "str",
+        "x": 230,
+        "y": 400,
+        "wires": [
+            [
+                "402f3b7e.988014"
+            ]
+        ]
+    },
+    {
+        "id": "8e876a75.e9beb8",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Write string to a file specied by filename property, the read from the file",
+        "info": "File node can target file using `filename` property.",
+        "x": 350,
+        "y": 320,
+        "wires": []
+    },
+    {
+        "id": "402f3b7e.988014",
+        "type": "file",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 390,
+        "y": 400,
+        "wires": [
+            [
+                "26e077d6.bbcd98"
+            ]
+        ]
+    },
+    {
+        "id": "97b6b6b2.a54b38",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 770,
+        "y": 400,
+        "wires": []
+    },
+    {
+        "id": "26e077d6.bbcd98",
+        "type": "file in",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "utf8",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "none",
+        "x": 580,
+        "y": 400,
+        "wires": [
+            [
+                "97b6b6b2.a54b38"
+            ]
+        ]
+    },
+    {
+        "id": "85062297.da79",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↑read result from file",
+        "info": "",
+        "x": 590,
+        "y": 440,
+        "wires": []
+    },
+    {
+        "id": "7316c4fc.b1dcdc",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↓write to file specified by filename property",
+        "info": "",
+        "x": 500,
+        "y": 360,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file/03 - Delete a file.json b/packages/node_modules/@node-red/nodes/examples/storage/file/03 - Delete a file.json
new file mode 100644
index 000000000..fe6ac166b
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/03 - Delete a file.json	
@@ -0,0 +1,85 @@
+[
+    {
+        "id": "4ac00fb0.d5f52",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 220,
+        "y": 600,
+        "wires": [
+            [
+                "542cc2f4.92857c"
+            ]
+        ]
+    },
+    {
+        "id": "671f8295.0e6f6c",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Delete a file",
+        "info": "File node can delete a file.",
+        "x": 170,
+        "y": 540,
+        "wires": []
+    },
+    {
+        "id": "542cc2f4.92857c",
+        "type": "file",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "delete",
+        "encoding": "none",
+        "x": 420,
+        "y": 600,
+        "wires": [
+            [
+                "a24da523.5babe8"
+            ]
+        ]
+    },
+    {
+        "id": "a24da523.5babe8",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 630,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "51157051.2f62",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↓delete a file",
+        "info": "",
+        "x": 390,
+        "y": 560,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/file/04 - Specify encoding of written data.json b/packages/node_modules/@node-red/nodes/examples/storage/file/04 - Specify encoding of written data.json
new file mode 100644
index 000000000..4dabbd670
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/file/04 - Specify encoding of written data.json	
@@ -0,0 +1,113 @@
+[
+    {
+        "id": "e4ef1f5e.7cd82",
+        "type": "inject",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "8J+YgA==",
+        "payloadType": "str",
+        "x": 220,
+        "y": 820,
+        "wires": [
+            [
+                "72b37cc8.177054"
+            ]
+        ]
+    },
+    {
+        "id": "f5997af4.5a9298",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "Specify encoding of written data",
+        "info": "File node can specify encoding of data.",
+        "x": 230,
+        "y": 740,
+        "wires": []
+    },
+    {
+        "id": "72b37cc8.177054",
+        "type": "file",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "base64",
+        "x": 400,
+        "y": 820,
+        "wires": [
+            [
+                "2da33ec.f45cac2"
+            ]
+        ]
+    },
+    {
+        "id": "2e814354.278c8c",
+        "type": "debug",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 790,
+        "y": 820,
+        "wires": []
+    },
+    {
+        "id": "2da33ec.f45cac2",
+        "type": "file in",
+        "z": "4b63452d.672afc",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "format": "utf8",
+        "chunk": false,
+        "sendError": false,
+        "encoding": "none",
+        "x": 600,
+        "y": 820,
+        "wires": [
+            [
+                "2e814354.278c8c"
+            ]
+        ]
+    },
+    {
+        "id": "ec754c99.84bfd",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↓write string with base64 encoding",
+        "info": "",
+        "x": 460,
+        "y": 780,
+        "wires": []
+    },
+    {
+        "id": "3e6704ff.4ce25c",
+        "type": "comment",
+        "z": "4b63452d.672afc",
+        "name": "↑read result from file",
+        "info": "",
+        "x": 610,
+        "y": 860,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/watch/01 - Watch change of a file.json b/packages/node_modules/@node-red/nodes/examples/storage/watch/01 - Watch change of a file.json
new file mode 100644
index 000000000..873e99b89
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/watch/01 - Watch change of a file.json	
@@ -0,0 +1,108 @@
+[
+    {
+        "id": "84222b92.d65d18",
+        "type": "inject",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "Hello, World!",
+        "payloadType": "str",
+        "x": 230,
+        "y": 160,
+        "wires": [
+            [
+                "b4b9f603.739598"
+            ]
+        ]
+    },
+    {
+        "id": "7b014430.dfd94c",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "Watch changes of a file",
+        "info": "Watch node can watch and report changes of a file.",
+        "x": 200,
+        "y": 80,
+        "wires": []
+    },
+    {
+        "id": "b4b9f603.739598",
+        "type": "file",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "filename": "/tmp/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 420,
+        "y": 160,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "672d3693.3cabd8",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "↓write to /tmp/hello.txt",
+        "info": "",
+        "x": 440,
+        "y": 120,
+        "wires": []
+    },
+    {
+        "id": "15f1f5aa.506ffa",
+        "type": "watch",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "files": "/tmp/hello.txt",
+        "recursive": "",
+        "x": 410,
+        "y": 200,
+        "wires": [
+            [
+                "a91562b9.ca805"
+            ]
+        ]
+    },
+    {
+        "id": "a91562b9.ca805",
+        "type": "debug",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 610,
+        "y": 200,
+        "wires": []
+    },
+    {
+        "id": "2ab4eba8.267d64",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "↑watch changes of  /tmp/hello.txt",
+        "info": "",
+        "x": 470,
+        "y": 240,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/examples/storage/watch/02 - Watch change in a directory.json b/packages/node_modules/@node-red/nodes/examples/storage/watch/02 - Watch change in a directory.json
new file mode 100644
index 000000000..6b7fd0b2e
--- /dev/null
+++ b/packages/node_modules/@node-red/nodes/examples/storage/watch/02 - Watch change in a directory.json	
@@ -0,0 +1,163 @@
+[
+    {
+        "id": "acec9dcc.eca82",
+        "type": "inject",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "Hello, World!",
+        "payloadType": "str",
+        "x": 230,
+        "y": 460,
+        "wires": [
+            [
+                "137d60e2.0e267f"
+            ]
+        ]
+    },
+    {
+        "id": "cf011d1e.8afa6",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "Watch changes in a directory",
+        "info": "Watch node can watch and report changes in a directory",
+        "x": 220,
+        "y": 340,
+        "wires": []
+    },
+    {
+        "id": "137d60e2.0e267f",
+        "type": "file",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "filename": "/tmp/HG/hello.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 430,
+        "y": 460,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9dfce283.63e5a",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "↓write to /tmp/HG/*",
+        "info": "",
+        "x": 430,
+        "y": 420,
+        "wires": []
+    },
+    {
+        "id": "cbfb788b.297f98",
+        "type": "watch",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "files": "/tmp/HG",
+        "recursive": false,
+        "x": 400,
+        "y": 540,
+        "wires": [
+            [
+                "3c691cd5.a0f2b4"
+            ]
+        ]
+    },
+    {
+        "id": "3c691cd5.a0f2b4",
+        "type": "debug",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 550,
+        "y": 540,
+        "wires": []
+    },
+    {
+        "id": "c0d7ca6e.cad418",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "↑watch changes in /tmp/HG",
+        "info": "",
+        "x": 460,
+        "y": 580,
+        "wires": []
+    },
+    {
+        "id": "a04e5231.5a2e1",
+        "type": "inject",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "Goodbye, World!",
+        "payloadType": "str",
+        "x": 240,
+        "y": 500,
+        "wires": [
+            [
+                "655d7bab.cda6f4"
+            ]
+        ]
+    },
+    {
+        "id": "655d7bab.cda6f4",
+        "type": "file",
+        "z": "a7ac8a68.0f7218",
+        "name": "",
+        "filename": "/tmp/HG/goodbye.txt",
+        "appendNewline": true,
+        "createDir": false,
+        "overwriteFile": "true",
+        "encoding": "none",
+        "x": 440,
+        "y": 500,
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f3b42209.a7673",
+        "type": "comment",
+        "z": "a7ac8a68.0f7218",
+        "name": "Notice: Create /tmp/HG directory before deploying this example",
+        "info": "",
+        "x": 330,
+        "y": 380,
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json
index 7d9bd3523..fe1e1dfc1 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json
@@ -583,11 +583,11 @@
       "regex" : "Reguläre Ausdrücke verwenden"
     },
     "action" : {
-      "set" : "Festlegen",
+      "set" : "Setze",
       "change" : "Ändern",
       "delete" : "Löschen",
       "move" : "Bewegen",
-      "to" : "bis",
+      "to" : "auf",
       "search" : "Suchen nach",
       "replace" : "Ersetzen durch"
     },
diff --git a/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
index 68df80963..aeab9c15e 100755
--- a/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/sequence/19-batch.html
@@ -20,19 +20,18 @@
     <p>Es gibt drei Modi für die Erstellung von Nachrichtensequenzen:</p>
     <dl>
         <dt>Anzahl der Nachrichten</dt>
-        <dd>Die Nachrichten werden zu Sequenzen einer bestimmten Länge gruppiert. Die Option <b>Überlappung</b>>
+        <dd>Die Nachrichten werden zu Sequenzen einer bestimmten Länge gruppiert. Die Option <b>Überlappung</b>
             gibt an, wie viele Nachrichten vom Ende einer Sequenz am Anfang der nächsten Sequenz wiederholt werden sollen.</dd>
 
         <dt>Zeitintervall</dt>
         <dd>Gruppiert Nachrichten, die innerhalb des angegebenen Intervalls eingehen. Wenn keine Nachrichten 
             innerhalb des Intervalls ankommen, kann der Node optional eine leere Nachricht senden.</dd>
 
-        <dt>Sequenzesn verketten/dt>
+        <dt>Sequenzen verketten/dt>
         <dd>Erzeugt eine Nachrichtensequenz durch die Verkettung eingehender Sequenzen. Jede Nachricht muss eine <code>msg.topic</code> 
             und eine <code>msg.parts</code> Eigenschaft haben, um die Sequenz identifizieren zu können. 
             Der Node ist mit einer Liste von <code>topic</code> konfiguriert,
-             mit der die Reihnmefolge der Verkettung der Sequenzen definiert wird.
-            </dd>
+             mit der die Reihenfolge der Verkettung der Sequenzen definiert wird.</dd>
     
     </dl>
     <h4>Speichern der Nachrichten</h4>
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html
index 1f9880a9f..dc4dd98ff 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html
@@ -37,9 +37,10 @@
     <h3>Details</h3>
     <p>The column template can contain an ordered list of column names. When converting CSV to an object, the column names
     will be used as the property names. Alternatively, the column names can be taken from the first row of the CSV.</p>
-    <p>When converting to CSV, the column template is used to identify which properties to extract from the object and in what order.</p>
-    <p>If the template is blank then the node can use a simple comma separated list of properties supplied in <code>msg.columns</code> to
-    determine what to extract. If that is not present then all the object properties are output in the order in which the properties are found in the first row.</p>
+    <p>When converting to CSV, the columns template is used to identify which properties to extract from the object and in what order.</p>
+    <p>If the columns template is blank then you can use a simple comma separated list of properties supplied in <code>msg.columns</code> to
+    determine what to extract and in what order. If neither are present then all the object properties are output in the order
+    in which the properties are found in the first row.</p>
     <p>If the input is an array then the columns template is only used to optionally generate a row of column titles.</p>
     <p>If 'parse numerical values' option is checked, string numerical values will be returned as numbers, ie. middle value '1,"1.5",2'.</p>
     <p>If 'include empty strings' option is checked, empty strings will be returned in result, ie. middle value '"1","",3'.</p>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ru/common/20-inject.html
index e265fccc6..5b762bc7d 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/20-inject.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="inject">
 <p>
-  Запускает сообщение в поток вручную или через равные промежутки времени. Данные сообщения могут быть различных типов, включая строку, объект JavaScript или текущее время.
+  Вбрасывает сообщение в поток вручную или через равные промежутки времени. Данные в сообщении могут быть различных типов, включая строку, объект JavaScript или метку текущего времени.
 </p>
 
 <h3>Выводит</h3>
@@ -29,26 +29,24 @@
 
 <h3>Подробности</h3>
 <p>
-  Узел Inject может инициировать поток с определенными данными (значение payload). Данные по умолчанию - это отметка текущего времени в миллисекундах с 1 января 1970 года.
+  Узел Inject может инициировать выполнение потока с определенными данными (значение payload). Данные по умолчанию - это метка текущего времени в миллисекундах, прошедших с 1 января 1970 года.
 </p>
 <p>
   Узел также поддерживает вывод строк, чисел, логических значений, объектов JavaScript или значений потоковых/глобальных контекстов.
 </p>
 <p>
-  По умолчанию узел запускается вручную при нажатии на его кнопку в редакторе. Его также можно настроить для автоматического запуска через равные промежутки времени или по расписанию.
+  По умолчанию узел запускается вручную при нажатии его кнопки в редакторе. Его также можно настроить на автоматический запуск через равные промежутки времени или по расписанию.
 </p>
 <p>
-  Он также может быть настроен так, чтобы делать вывод один раз при каждом запуске потоков.
+  Он также может быть настроен однократный вброс сообщения при каждом (пере)запуске потоков.
 </p>
 <p>
-  Максимальный <i>интервал</i>, который можно указать, составляет около 596 часов / 24 дней. Однако если Вам нужны интервалы, превышающие один день, Вам следует рассмотреть возможность использования узла планировщика, который может работать с перебоями электроэнергии и перезапусками.
+  Максимальный <i>интервал</i>, который можно указать, составляет около 596 часов / 24 дней. Однако если Вам нужны интервалы, превышающие один день, Вам следует рассмотреть возможность использования функций планировщика в узле, которые смогут корректно работать с перебоями электроэнергии и перезапусками.
 </p>
 <p>
-  <b>Примечание</b>: В параметрах <i>"с интервалом в промежутке"</i> и <i>"в определенное время"</i> используется стандартная система cron.
-  Это означает, что 20 минут будут в следующем часу, 20 минут спустя и 40 минут спустя - а не через 20 минут.
-  Если нужно каждые 20 минут - используйте параметр <i>"с интервалом"</i>.
+  <b>Примечание</b>: В параметрах <i>"с интервалом в промежутке"</i> и <i>"в определенное время"</i> используется стандартная система "cron". Это означает, что "20 минут" будут в следующем часу, 20 минут спустя и 40 минут спустя - а не через 20 минут. Если нужен вброс сообщений каждые 20 минут - используйте параметр <i>"с интервалом"</i>.
 </p>
 <p>
-  <b>Примечание</b>: Чтобы включить многострочный текст в строковое значение, необходимо использовать узел Function для создания данных.
+  <b>Примечание</b>: Чтобы включить многострочный текст в строковое значение, необходимо использовать узел Function для формирования данных.
 </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/21-debug.html b/packages/node_modules/@node-red/nodes/locales/ru/common/21-debug.html
index 66edb72cc..7804e6af5 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/21-debug.html
@@ -16,24 +16,24 @@
 
 <script type="text/html" data-help-name="debug">
   <p>
-    Отображает выбранные свойства сообщения на боковой панели во вкладке отладки и, при необходимости, журнале выполнения. По умолчанию отображается содержимое <code>msg.payload</code>, но его можно настроить для отображения любого свойства, полного сообщения или результата выражения JSONata.
+    Отображает выбранные свойства получаемых узлом сообщения на боковой панели во вкладке отладки и, при необходимости, журнале среды выполнения. По умолчанию отображается содержимое <code>msg.payload</code>, но узел можно настроить на отображение любого свойства, всех свойств сообщения или результата выражения JSONata.
   </p>
 
   <h3>Подробности</h3>
   <p>
-    Вкладка отладки на боковой панели обеспечивает структурированное представление отправляемых сообщений, что упрощает понимание их структуры.
+    Вкладка отладки на боковой панели обеспечивает структурированное представление полученных узлом сообщений, что упрощает исследование их структуры.
   </p>
   <p>
-    Объекты и массивы JavaScript могут быть свернуты и развернуты по мере необходимости. Буферные объекты могут отображаться в виде сырых данных или как строка, когда это возможно.
+    Объекты и массивы JavaScript могут быть свернуты и развернуты по мере необходимости. Буферы могут отображаться в виде данных как есть или в виде строки, когда это возможно.
   </p>
   <p>
-    Рядом с каждым сообщением отладочная панель содержит информацию о времени получения сообщения, узле, который его отправил, и типе сообщения.
-    Нажатие на идентификатор узла-источника, показывает этот узел в рабочей области.
+    Рядом с каждым сообщением отладочная панель показывает информацию о времени получения сообщения, узле, который его отправил, и типе данных.
+    Нажатие на идентификатор узла-источника покажет этот узел в рабочей области.
   </p>
   <p>
-    Кнопка на узле может использоваться для включения или отключения его вывода. Рекомендуется отключать или удалять любые отладочные узлы, которые не используются.
+    Кнопка на узле может использоваться для включения или отключения вывода информации о получаемых сообщениях. Рекомендуется отключать или удалять любые отладочные узлы, которые не используются.
   </p>
   <p>
-    Узел также может быть сконфигурирован для отправки всех сообщений в журнал выполнения или для отправки короткого (32 символа) текста в статус под узлом отладки.
+    Узел также может быть настроен на отправку всех сообщений в журнал выполнения или отправку короткого (32 символа) текста в статус под узлом.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/24-complete.html b/packages/node_modules/@node-red/nodes/locales/ru/common/24-complete.html
index 3709f82dc..672310d6f 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/24-complete.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/24-complete.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="complete">
   <p>
-    Запустить поток, когда другой узел завершит обработку сообщения.
+    Инициирует запуск потока, когда другой узел завершает обработку сообщения.
   </p>
 
   <h3>Подробности</h3>
@@ -24,12 +24,12 @@
     Если узел сообщает среде выполнения о завершении обработки сообщения, этот узел можно использовать для запуска второго потока.
   </p>
   <p>
-    Например, это можно использовать вместе с узлом без выходного порта, таким как узел Email, для продолжения потока.
+    Например, его можно использовать вместе с узлом, у которого нет выходного порта, таким как узел Email, для продолжения потока.
   </p>
   <p>
-    Этот узел должен быть настроен для обработки события выбранных узлов в потоке. В отличие от узла Catch, он не предоставляет режим 'обрабатывать все' для автоматического применения ко всем узлам в потоке.
+    Этот узел должен быть настроен на отслеживание событий выбранных узлов в потоке. В отличие от узла Catch, у него нет режима 'обрабатывать все' для автоматического применения ко всем узлам в потоке.
   </p>
   <p>
-    Не все узлы будут инициировать это событие - это будет зависеть от того, была ли в них реализована поддержка этой функции, добавленной в Node-RED 1.0.
+    Не все узлы могут инициировать запуск потока по завршению обработки сообщения. все зависит от того, была ли в них реализована поддержка этой функции, добавленной в Node-RED 1.0, или нет.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/25-catch.html b/packages/node_modules/@node-red/nodes/locales/ru/common/25-catch.html
index 867e9b203..af1627c22 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/25-catch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/25-catch.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="catch">
   <p>
-    Ловит ошибки, выдаваемые узлами на той же вкладке.
+    Ловит ошибки, выбрасываемые узлами на той же вкладке.
   </p>
 
   <h3>Выводит</h3>
@@ -28,21 +28,21 @@
     <dt>error.source.type <span class="property-type">строка</span></dt>
     <dd>тип узла, выдавшего ошибку.</dd>
     <dt>error.source.name <span class="property-type">строка</span></dt>
-    <dd>имя, если установлено, узла, выдавшего ошибку.</dd>
+    <dd>имя узла, выдавшего ошибку, если было настроено.</dd>
   </dl>
 
   <h3>Подробности</h3>
   <p>
-    Если узел выдает ошибку во время обработки сообщения, поток обычно останавливается. Этот узел можно использовать для отлова этих ошибок и обработки их с помощью отдельного потока.
+    Если узел выбрасывает ошибку во время обработки сообщения, поток обычно останавливается. Этот узел можно использовать для отлова и обработки таких ошибок с помощью отдельного потока.
   </p>
   <p>
-    По умолчанию узел будет отлавливать ошибки, генерируемые любым узлом на той же вкладке. По желанию он может быть нацелен на определенные узлы или настроен на перехват только тех ошибок, которые не были еще перехвачены 'нацеленным' Catch узлом.
+    По умолчанию узел будет отлавливать ошибки, генерируемые любым узлом на той же вкладке. По желанию он может быть нацелен на определенные узлы или настроен на перехват только тех ошибок, которые не были перехвачены 'нацеленным' Catch узлом.
   </p>
   <p>
     Когда выдается ошибка, все соответствующие Catch узлы получат сообщение.
   </p>
   <p>
-    Если ошибка выдается в подпотоке, она будет обработана любыми Catch узлами внутри подпотока. Если таковых нет, ошибка будет распространена до вкладки, на которой находится экземпляр подпотока.
+    Если ошибка выбрасывается в подпотоке, она будет обработана любыми Catch узлами внутри подпотока. Если таковых нет, ошибка будет распространена до вкладки, на которой находится экземпляр подпотока.
   </p>
   <p>
     Если сообщение уже имеет свойство <code>error</code>, оно копируется в <code>_error</code>.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/25-status.html b/packages/node_modules/@node-red/nodes/locales/ru/common/25-status.html
index 2ae478dc9..987113097 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/25-status.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/25-status.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="status">
   <p>
-    Сообщает о статусах других узлов на той же вкладке.
+    Инициирует запуск потока при изменении статуса других узлов на той же вкладке.
   </p>
 
   <h3>Выводит</h3>
@@ -28,7 +28,7 @@
     <dt>status.source.id <span class="property-type">строка</span></dt>
     <dd>идентификатор узла, сообщившего о статусе.</dd>
     <dt>status.source.name <span class="property-type">строка</span></dt>
-    <dd>имя, если установлено, узла, сообщившего о статусе.</dd>
+    <dd>имя узла, сообщившего о статусе, если настроено.</dd>
   </dl>
 
   <h3>Подробности</h3>
@@ -36,6 +36,6 @@
     Этот узел не создает <code>payload</code> данные.
   </p>
   <p>
-    По умолчанию узел сообщает о статусах всех узлов на той же вкладке в рабочей области. Его можно настроить для выборочного отчета о статусе отдельных узлов.
+    По умолчанию узел сообщает о статусах всех узлов на той же вкладке в рабочей области. Его можно настроить на выборочное отслеживание статуса только отдельных узлов.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/60-link.html b/packages/node_modules/@node-red/nodes/locales/ru/common/60-link.html
index 1ef3079af..f2894da97 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/60-link.html
@@ -21,13 +21,13 @@
 
   <h3>Подробности</h3>
   <p>
-    Этот узел может быть подключен к любому узлу <code>link out</code> на любой вкладке. После подключения они ведут себя так, как если бы они были соединены вместе обычным проводом.
+    Этот узел может быть подключен к любому <code>link out</code> узлу на любой вкладке. После подключения они ведут себя так, как если бы они были соединены вместе обычным проводом.
   </p>
   <p>
-    Связи между link-узлами отображаются, только когда выбран link-узел. Если есть какие-либо провода к другим вкладкам, отображается виртуальный узел, по которому можно кликнуть, чтобы перейти на соответствующую вкладку.
+    Связи между link-узлами отображаются, только когда выбран один из соединенных link узлов. Если есть какие-либо провода, ведущие на другие вкладки, они отображаются в виде виртуального узла, по которому можно кликнуть, чтобы перейти на соответствующую вкладку.
   </p>
   <p>
-    <b>Примечание:</b> Связи не могут идти внутрь подпотока или изнутри подпотока наружу.
+    <b>Примечание:</b> Провод не может вести внутрь подпотока или изнутри подпотока наружу.
   </p>
 </script>
 
@@ -38,12 +38,12 @@
 
   <h3>Подробности</h3>
   <p>
-    Узел может быть подключен к любому узлу <code>link in</code> на любой вкладке. После подключения они ведут себя так, как если бы они были соединены вместе обычным проводом.
+    Узел может быть подключен к любому <code>link in</code> узлу на любой вкладке. После подключения они ведут себя так, как если бы они были соединены вместе обычным проводом.
   </p>
   <p>
-    Связи между link-узлами отображаются, только когда выбран link-узел. Если есть какие-либо провода к другим вкладкам, отображается виртуальный узел, по которому можно кликнуть, чтобы перейти на соответствующую вкладку.
+    Связи между link-узлами отображаются, только когда выбран один из соединенных link узлов. Если есть какие-либо провода, ведущие на другие вкладки, они отображаются в виде виртуального узла, по которому можно кликнуть, чтобы перейти на соответствующую вкладку.
   </p>
   <p>
-    <b>Примечание:</b> Связи не могут идти внутрь подпотока или изнутри подпотока наружу.
+    <b>Примечание:</b> Провод не может вести внутрь подпотока или изнутри подпотока наружу.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/90-comment.html b/packages/node_modules/@node-red/nodes/locales/ru/common/90-comment.html
index f8cb254bd..69ba9ba12 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/90-comment.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/90-comment.html
@@ -16,11 +16,11 @@
 
 <script type="text/html" data-help-name="comment">
   <p>
-    Узел, который Вы можете использовать для добавления комментариев к Вашим потокам.
+    Узел, который можно использовать для добавления комментариев к вашим потокам.
   </p>
 
   <h3>Подробности</h3>
   <p>
-    Панель редактирования поддерживает синтаксис Markdown. Текст будет отображен как 'описание' на этой информационной вкладке.
+    Окно редактирования поддерживает синтаксис Markdown. Текст будет отображен на информационной вкладке боковой панели в секции 'описание'.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/common/98-unknown.html b/packages/node_modules/@node-red/nodes/locales/ru/common/98-unknown.html
index 6ffb5a03a..f9fd62285 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/common/98-unknown.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/common/98-unknown.html
@@ -16,22 +16,22 @@
 
 <script type="text/html" data-help-name="unknown">
   <p>
-    Тип этого узла неизвестен Вашему Node-RED.
+    Тип этого узла неизвестен вашему Node-RED.
   </p>
 
   <h3>Подробности</h3>
   <p>
     <i>
-      Если Вы развернете узел в этом состоянии, его конфигурация будет сохранена, но поток не будет запущен, пока не будет установлен отсутствующий тип.
+      Если вы развернете узел в этом состоянии, его настройки будут сохранены, но поток не будет запущен до тех пор, пока не будет установлен отсутствующий тип.
     </i>
   </p>
   <p>
-    Используйте опцию <code>Меню - Управление палитрой</code> для поиска и установки узлов или <b>npm install &lt;модуль&gt;</b> для установки любых отсутствующих модулей и перезапустите Node-RED и повторно импортируйте узлы.
+    Используйте опцию <code>Меню - Управление палитрой</code> для поиска и установки узлов или <b>npm install &lt;модуль&gt;</b> для установки отсутствующих модулей. Затем перезапустите Node-RED и повторно импортируйте узлы.
   </p>
   <p>
-    Возможно, этот тип узла уже установлен, но отсутствуют какие-то из его зависимостей. Проверьте журнал запуска Node-RED на наличие сообщений об ошибках, связанных с отсутствующим типом узла.
+    Возможно, этот тип узла уже установлен, но отсутствуют какие-то из его зависимостей. Проверьте журнал выполнения Node-RED на наличие сообщений об ошибках, связанных с отсутствующим типом узла.
   </p>
   <p>
-    В противном случае Вам следует связаться с автором потока, чтобы получить копию отсутствующего типа узла.
+    В противном случае вам следует связаться с автором потока, чтобы получить отсутствующий тип узла.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html b/packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html
index f99408605..9ba16d4be 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html
@@ -16,22 +16,22 @@
 
 <script type="text/html" data-help-name="function">
   <p>
-    Блок с JavaScript функцией, написанной во вкладке <b>Функция</b>, которая исполняется для сообщений, получаемых узлом.
+    Исполняет JavaScript функцию (введенную в настройках, во вкладке <b>Функция</b>) для всех получаемых узлом сообщений.
   </p>
   <p>
     Сообщения передаются в виде объекта JavaScript с именем <code>msg</code>.
   </p>
   <p>
-    Обычно он имеет свойство <code>msg.payload</code>, содержащее тело сообщения.
+    Обычно у объекта есть свойство <code>msg.payload</code>, содержащее тело сообщения.
   </p>
   <p>
-    Ожидается, что функция вернет объект сообщения (или несколько объектов сообщения), но может также ничего не возвращать, чтобы остановить поток.
+    Ожидается, что функция вернет объект сообщения (или несколько объектов сообщения), которые будут отправлены следующим узлам в потоке, но может также ничего не возвращать, чтобы остановить поток.
   </p>
   <p>
-    Код настройки, выполняемый один раз при запуске сервера или при развертывании новой конфигурации потока, можно указать во вкладке <b>Настройка</b>. Кроме того, код очистки, выполняемый при остановке или повторном развертывании узла, можно указать во вкладке <b>Закрытие</b>.
+    Код настройки, выполняемый один раз при запуске сервера или при развертывании новой конфигурации потока, можно ввести во вкладке <b>Настройка</b>. Также во вкладке <b>Закрытие</b> можно ввести код очистки, выполняемый при остановке или повторном развертывании узла.
   </p>
   <p>
-    Если код настройки возвращает объект Promise, обработка входящих сообщений узлом начнется после его завершения.
+    Если код настройки возвращает Promise объект, тогда обработка входящих сообщений узлом начнется после его завершения.
   </p>
 
   <h3>Подробности</h3>
@@ -47,8 +47,8 @@
     Она может вернуть/отправить:
   </p>
   <ul>
-    <li>один объект сообщения - передается узлам, подключенным к первому выходу</li>
-    <li>массив объектов сообщений - передается на узлы, подключенные к соответствующим выходам</li>
+    <li>один объект сообщения - передается узлам, подключенным к первому порту выхода</li>
+    <li>массив объектов сообщений - передается на узлы, подключенные к соответствующим портам выхода</li>
   </ul>
   <p>
     Примечание: код настройки выполняется во время инициализации узлов. Таким образом, если на вкладке настройки кода вызывается <code>node.send</code>, последующие узлы могут не получить это сообщение.
@@ -70,13 +70,13 @@
     <li><code>node.error("Ошибка")</code></li>
   </ul>
   <p>
-    Узел Catch также может использоваться для обработки ошибок. Чтобы узел Catch мог ловить сообщение об ошибке, передайте <code>msg</code> в качестве второго аргумента в <code>node.error</code>:
+    Также узел Catch может использоваться для обработки ошибок. Чтобы можно было ловить оповещения об ошибке, при вызове <code>node.error</code> передайте <code>msg</code> в качестве второго аргумента:
   </p>
   <pre>node.error("Ошибка", msg);</pre>
 
   <h4>Доступ к информации об узле</h4>
   <p>
-    В функциональном блоке к идентификатору и имени узла можно обращаться, используя следующие свойства:
+    В функции можно обращаться к идентификатору и имени узла, используя следующие свойства:
   </p>
   <ul>
     <li><code>node.id</code> - идентификатор узла</li>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/10-switch.html b/packages/node_modules/@node-red/nodes/locales/ru/function/10-switch.html
index ba1432056..d2a1e92b1 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/10-switch.html
@@ -16,18 +16,18 @@
 
 <script type="text/html" data-help-name="switch">
   <p>
-    Направляет сообщения по разным ветвям потока на основе значений свойств сообщения или его позиции в последовательности.
+    Направляет сообщения по разным ветвям потока, в завсимости от значений свойств сообщения или его позиции в последовательности.
   </p>
 
   <h3>Подробности</h3>
   <p>
-    Когда приходит сообщение, узел выполняет проверку соответствия каждому из определенных правил и перенаправляет сообщение на их выходы.
+    Когда приходит сообщение, узел выполняет проверку соответствия сообщения каждому из установленных правил и перенаправляет сообщение на соответствующие выходы.
   </p>
   <p>
-    При желании узел может быть настроен на прекращение проверки правил, как только он найдет первое подходящее.
+    При желании узел может быть настроен на прекращение проверки правил после того как найдено первое подходящее.
   </p>
   <p>
-    Правила могут выполняться для отдельного свойства сообщения, свойства потокового или глобального контекста, переменной среды или результата выражения JSONata.
+    Правила могут применяться к свойству сообщения, свойству потокового или глобального контекста, переменной среды или результату выражения JSONata.
   </p>
 
   <h4>Правила</h4>
@@ -35,8 +35,8 @@
     Существует четыре типа правил:
   </p>
   <ol>
-    <li>Правила <b>value rules</b> сравниваются с указанным свойством</li>
-    <li>Правила <b>sequence rules</b> могут применяться для последовательностей сообщений, таких как сгенерированные узлом Split</li>
+    <li>Правила категории <b>value rules</b> сравнивают значение указанного свойства сообщения</li>
+    <li>Правила категории  <b>sequence rules</b> могут применяться для последовательностей сообщений, таких как сгенерированные узлом Split</li>
     <li><b>Выражение JSONata</b> исполняется для сообщения и считается подходящим, если оно возвращает истинное значение</li>
     <li>Правило <b>иначе</b> используется для сообщений, не подходящих ни под одно из предыдущих правил.</li>
   </ol>
@@ -51,7 +51,7 @@
 
   <h4>Обработка последовательностей сообщений</h4>
   <p>
-    По умолчанию узел не изменяет свойство <code>msg.parts</code> у сообщений, которые являются частью последовательности.
+    По умолчанию узел не изменяет свойство <code>msg.parts</code> у сообщений, являющихся частью последовательности.
   </p>
   <p>
     Можно включить параметр <b>пересоздавать последовательности сообщений</b> для создания новых последовательностей сообщений для каждого соответствующего правила. В этом режиме узел будет помещать в буфер всю входящую последовательность перед отправкой новых последовательностей. Настройка <code>nodeMessageBufferMaxLength</code> может быть использована для ограничения количества сообщений в буфере.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/15-change.html b/packages/node_modules/@node-red/nodes/locales/ru/function/15-change.html
index aa3e8a233..0286dc414 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/15-change.html
@@ -19,7 +19,7 @@
     Устанавливает, изменяет, удаляет или перемещает свойства сообщения, контекста потока или глобального контекста.
   </p>
   <p>
-    В узле можно указать несколько правил, которые будут применяться в том порядке, в котором они определены.
+    В узле можно указать несколько операций, которые будут применяться в том порядке, в котором они заданы.
   </p>
 
   <h3>Подробности</h3>
@@ -28,13 +28,13 @@
   </p>
   <dl class="message-properties">
     <dt>Установить</dt>
-    <dd>установить свойство. Значение может быть разных типов или может быть взято из существующего свойства сообщения или контекста.</dd>
+    <dd>устанавливает свойство. Значение может быть различных типов или может быть взято из существующего свойства сообщения или контекста.</dd>
     <dt>Изменить</dt>
-    <dd>найти &amp; заменить части свойства. Если используется регулярное выражение, настройка &quot;заменить на&quot; может включать группы захвата, например <code>$1</code>. При полном совпадении заменяет только тип.</dd>
+    <dd>ищет и заменяет части текста в свойстве сообщения. Если используется регулярное выражение, настройка &quot;заменить на&quot; может включать группы захвата, например <code>$1</code>. При полном совпадении заменяет только тип.</dd>
     <dt>Удалить</dt>
-    <dd>удалить свойство.</dd>
+    <dd>удаляет свойство.</dd>
     <dt>Переместить</dt>
-    <dd>переместить или переименовать свойство.</dd>
+    <dd>перемещает или переименовывает свойство.</dd>
   </dl>
   <p>
     Тип свойства &quot;выражение&quot; использует язык запросов и выражений <a href="http://jsonata.org/" target="_new">JSONata</a>.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/16-range.html b/packages/node_modules/@node-red/nodes/locales/ru/function/16-range.html
index 00deacb23..b6f2c02d6 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/16-range.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="range">
   <p>
-    Соотносит значение одного числового диапазона к другому числовому диапазону.
+    Соотносит значение одного числового диапазона с другим числовым диапазоном.
   </p>
 
   <h3>Принимает</h3>
@@ -28,7 +28,7 @@
   <h3>Выводит</h3>
   <dl class="message-properties">
     <dt>payload <span class="property-type">число</span></dt>
-    <dd>Значение, соотнесенное к новому диапазону.</dd>
+    <dd>Значение, соотнесенное с новым диапазоном.</dd>
   </dl>
 
   <h3>Подробности</h3>
@@ -42,7 +42,7 @@
     <i>Масштабировать и обернуть в целевой диапазон</i> означает, что результат будет обернут вокруг целевого диапазона:
   </p>
   <p>
-    Например, для входа 0 - 10 сопоставленного с 0 - 100.
+    Например, если входные 0 - 10 сопоставляются с 0 - 100:
   </p>
   <table style="outline-width:#888 solid thin">
     <tr><th width="80px">режим</th><th width="80px">вход</th><th width="80px">выход</th></tr>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/80-template.html b/packages/node_modules/@node-red/nodes/locales/ru/function/80-template.html
index bc8618cd6..5068c0474 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/80-template.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="template">
   <p>
-    Устанавливает свойство на основе предоставленного шаблона.
+    Генерирует текст по установленному шаблону и присваивает его выбранному свойству сообщения.
   </p>
 
   <h3>Принимает</h3>
@@ -24,23 +24,23 @@
     <dt>msg <span class="property-type">объект</span></dt>
     <dd>Объект сообщения msg, содержащий информацию для заполнения шаблона.</dd>
     <dt class="optional">шаблон <span class="property-type">строка</span></dt>
-    <dd>Шаблон для заполнения данными из сообщения msg. Если шаблон не настроен на панели редактирования, тогда он может быть установлен через свойство msg.template.</dd>
+    <dd>Шаблон текста для заполнения данными из сообщения msg. Если шаблон не введен на панели редактирования, тогда он может быть установлен через свойство msg.template.</dd>
   </dl>
 
   <h3>Выводит</h3>
   <dl class="message-properties">
     <dt>msg <span class="property-type">объект</span></dt>
-    <dd>Сообщение msg, у которого выбранному свойству присвоено значение, сформированное заполнением шаблона свойствами из входящего сообщения.</dd>
+    <dd>Сообщение msg, у которого выбранному свойству присвоено тексктовое значение, полученное после заполнения шаблона данными входящего сообщения.</dd>
   </dl>
 
   <h3>Подробности</h3>
   <p>
-    По умолчанию используется формат <i><a href="http://mustache.github.io/mustache.5.html" target="_blank">mustache</a></i>, но это может быть выключено при необходимости.
+    По умолчанию используется формат <i><a href="http://mustache.github.io/mustache.5.html" target="_blank">mustache</a></i>. При необходимости это можно отключить.
   </p>
   <p>
     Например, когда шаблон:
   </p>
-  <pre>Привет, {{payload.name}}. Сегодня {{date}}</pre>
+  <pre>Привет, {{payload.name}}. Сегодня {{date}}.</pre>
   <p>
     получает сообщение msg, содержащее:
   </p>
@@ -51,13 +51,13 @@
   }
 }</pre>
   <p>
-    Результирующее свойство будет:
+    Выбранному свойству будет присвоен текст:
   </p>
-  <pre>Привет, Иван. Сегодня понедельник</pre>
+  <pre>Привет, Иван. Сегодня понедельник.</pre>
   <p>
     Можно использовать свойство из контекста потока или глобального контекста. Просто используйте <code>{{flow.name}}</code> или <code>{{global.name}}</code>, или для постоянного хранилища <code>store</code> используйте <code>{{flow[store].name}}</code> или <code>{{global[store].name}}</code>.
   </p>
   <p>
-    <b>Примечание:</b> по умолчанию <i>mustache</i> кодирует любые не алфавитно-цифровых или HTML-сущности в значениях, которые он подставляет, для безопасного использования в HTML. Чтобы предотвратить это, используйте тройные фигурные скобки <code>{{{triple}}}</code>.
+    <b>Примечание:</b> по умолчанию <i>mustache</i> заменяет определенные символы их escape-кодами для безопасного использования в HTML. Чтобы это не происходило, вы можете использовать тройные фигурные скобки <code>{{{triple}}}</code>.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/89-delay.html b/packages/node_modules/@node-red/nodes/locales/ru/function/89-delay.html
index 2a86fd64c..4489155ac 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/89-delay.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/89-delay.html
@@ -21,20 +21,20 @@
   <h3>Принимает</h3>
   <dl class="message-properties">
     <dt class="optional">delay <span class="property-type">число</span></dt>
-    <dd>Устанавливает задержку в миллисекундах, которая будет применена к сообщению. Этот параметр применяется только в том случае, если узел настроен на то, чтобы разрешать сообщению переопределять установленный интервал задержки по умолчанию.</dd>
+    <dd>Устанавливает задержку в миллисекундах, которая будет применена к сообщению. Этот параметр применяется только в том случае, если узел настроен так, чтобы разрешать сообщению переопределять установленный интервал задержки по умолчанию.</dd>
     <dt class="optional">reset</dt>
-    <dd>Если в полученном сообщении этому свойству присвоено какое-либо значение, все ожидающие сообщения, удерживаемые узлом, очищаются без дальнейшей отправки.</dd>
+    <dd>Если в полученном сообщении этому свойству присвоено какое-либо значение, все ожидающие сообщения, удерживаемые узлом, сбрасываются без дальнейшей отправки.</dd>
     <dt class="optional">flush</dt>
     <dd>Если в полученном сообщении этому свойству присвоено какое-либо значение, все ожидающие сообщения, удерживаемые узлом, немедленно отправляются далее.</dd>
   </dl>
   <h3>Подробности</h3>
   <p>
-    Когда настроено задерживать сообщения, интервал задержки может быть фиксированным значением, случайным значением в пределах диапазона или динамически установленным для каждого сообщения. Каждое сообщение задерживается независимо от любых других сообщений, основываясь на времени его прибытия.
+    Когда узел настроен на задержку сообщений, интервал задержки может быть фиксированным значением, случайным значением в пределах диапазона или динамически установленным для каждого сообщения. Каждое сообщение задерживается независимо от любых других сообщений, основываясь на времени его прибытия в узел.
   </p>
   <p>
-    Когда настроено ограничивать скорость сообщений, их доставка распределяется по настроенному периоду времени. Статус показывает количество сообщений, находящихся в данный момент в очереди. Если выбрано он может отбрасывать промежуточные сообщений по мере их поступления.
+    Когда узел настроен на ограничение скорости сообщений, их доставка распределяется по установленному периоду времени. Статус показывает количество сообщений, находящихся в данный момент в очереди. При необходимости узел может быть настроен на отбрасывание промежуточных сообщений по мере их поступления.
   </p>
   <p>
-    Ограничение скорости может применяться ко всем сообщениям или группировать их в соответствии со значением <code>msg.topic</code>. При группировании промежуточные сообщения автоматически отбрасываются. В каждом интервале времени узел может либо выпустить самое последнее сообщение для всех тем, либо выпустить самое последнее сообщение для следующей темы.
+    Ограничение скорости может применяться ко всем сообщениям или группам сообщений в соответствии с их значением темы (<code>msg.topic</code>). При группировании промежуточные сообщения автоматически отбрасываются. В каждом интервале времени узел может либо выпустить самое последнее сообщение для всех тем, либо выпустить самое последнее сообщение для следующей темы.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/89-trigger.html b/packages/node_modules/@node-red/nodes/locales/ru/function/89-trigger.html
index c53058235..9a8d687cf 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/89-trigger.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="trigger">
   <p>
-    При срабатывании может отправить сообщение, а затем дополнительно второе сообщение, если оно не продлено или не сброшено.
+    При срабатывании может отправить сообщение, а затем дополнительно второе сообщение, если не было сделано продление или сброс.
   </p>
 
   <h3>Принимает</h3>
@@ -24,15 +24,15 @@
     <dt class="optional">delay <span class="property-type">число</span></dt>
     <dd>Устанавливает задержку в миллисекундах, которая будет применяться к сообщению. Этот параметр применяется только в том случае, если узел настроен так, чтобы сообщение могло отменять настроенный интервал задержки по умолчанию.</dd>
     <dt class="optional">reset</dt>
-    <dd>Если сообщение получено с этим свойством, любой тайм-аут или повтор, находящийся в обработке в текущий момент, будет сброшен, и сообщение не сработает.</dd>
+    <dd>При получении сообщения с этим свойством, любой тайм-аут или повтор, находящиеся в обработке в текущий момент, будут сброшены, а сообщение не сработает.</dd>
   </dl>
 
   <h3>Подробности</h3>
   <p>
-    Этот узел можно использовать для создания тайм-аута в потоке. По умолчанию, когда узел получает сообщение, он отправляет сообщение с <code>payload</code> равным <code>1</code>. Затем он ждет 250 мс, прежде чем отправить второе сообщение с <code>payload</code> равным <code>0</code>. Это можно использовать, например, для мигания светодиода, подключенного к выводу Raspberry Pi GPIO.
+    Этот узел можно использовать для создания тайм-аута внутри потока. По умолчанию, когда узел получает сообщение, он отправляет сообщение с <code>payload</code> равным <code>1</code>. Затем он ждет 250 мс, прежде чем отправить второе сообщение с <code>payload</code> равным <code>0</code>. Это можно использовать, например, для мигания светодиодом, подключеным к выходу GPIO у Raspberry Pi.
   </p>
   <p>
-    Данные каждого отправленного сообщения могут быть настроены на различные значения, включая возможность ничего не отправлять. Например, если установить начальное сообщение на <i>ничего</i> и выбрать опцию продления таймера с каждым новым сообщением, узел будет действовать как сторожевой таймер, отправляя сообщение только в том случае, если ничего не получено в течение установленного интервала.
+    Данные каждого отправленного сообщения могут быть настроены на различные значения, включая возможность ничего не отправлять. Например, если установить первоначальное сообщение на <i>ничего</i> и выбрать опцию продления таймера с каждым новым сообщением, узел будет действовать как сторожевой таймер, отправляя сообщение только в том случае, если ничего не получено в течение установленного интервала.
   </p>
   <p>
     Если установлен тип <i>строка</i>, узел поддерживает синтаксис шаблона mustache.
@@ -44,12 +44,12 @@
     Если узел получает сообщение со свойством <code>reset</code> или <code>payload</code>, который совпадает с настроенным в узле, любой тайм-аут или повтор, находящийся в обработке в текущий момент, будет сброшен, и сообщение не сработает.
   </p>
   <p>
-    Узел может быть настроен на повторную отправку сообщения с регулярным интервалом, пока оно не будет сброшено полученным сообщением.
+    Узел может быть настроен на повторную отправку сообщения с регулярным интервалом, пока не будет произведен сброс отправкой на него сообщения.
   </p>
   <p>
     При желании узел может быть настроен на обработку сообщений, как если бы они были отдельными потоками, используя свойство msg для идентификации каждого потока. По умолчанию <code>msg.topic</code>.
   </p>
   <p>
-    Статус показывает, что узел в данный момент активен. Если используется несколько потоков, статус показывает количество удерживаемых потоков.
+    Статус показывает - активен ли узел в данный момент. Если работает в многопоточном режиме, статус показывает количество удерживаемых потоков.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/function/90-exec.html b/packages/node_modules/@node-red/nodes/locales/ru/function/90-exec.html
index b654673fe..708ddfbc9 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/90-exec.html
@@ -19,16 +19,16 @@
     Запускает системную команду и возвращает ее вывод.
   </p>
   <p>
-    Узел может быть настроен либо на ожидание завершения команды, либо на отправку своих выходных данных, пока команда их генерирует.
+    Узел может быть настроен либо на ожидание завершения выполнения команды, либо на отправку выходных данных по мере их генерации в ходе выполнения.
   </p>
   <p>
-    Выполняемая команда может быть настроена в узле или предоставлена полученным сообщением.
+    Выполняемая команда может быть установлена в настройках узла или полученным сообщением.
   </p>
 
   <h3>Принимает</h3>
   <dl class="message-properties">
     <dt class="optional">payload <span class="property-type">строка</span></dt>
-    <dd>будет добавлено к выполненной команде, если настроено так делать.</dd>
+    <dd>будет добавлено к выполняемой команде, если узел настроен так делать.</dd>
     <dt class="optional">kill <span class="property-type">строка</span></dt>
     <dd>тип сигнала уничтожения для отправки существующему процессу узла exec.</dd>
     <dt class="optional">pid <span class="property-type">число|строка</span></dt>
@@ -44,7 +44,7 @@
       </dl>
       <dl class="message-properties">
         <dt>rc <span class="property-type">объект</span></dt>
-        <dd>только в exec режиме, копия объекта кода возврата (также доступна на порту 3)</dd>
+        <dd>только в exec режиме, копия объекта кода возврата (также доступна по 3-му порту)</dd>
       </dl>
     </li>
     <li>Стандартный вывод ошибок
@@ -54,7 +54,7 @@
       </dl>
       <dl class="message-properties">
         <dt>rc <span class="property-type">объект</span></dt>
-        <dd>только в exec режиме, копия объекта кода возврата (также доступна на порту 3)</dd>
+        <dd>только в exec режиме, копия объекта кода возврата (также доступна по 3-му порту)</dd>
       </dl>
     </li>
     <li>Код возврата
@@ -73,7 +73,7 @@
     При желании вместо этого можно использовать <code>spawn</code>, который возвращает выходные данные из stdout и stderr по ходу выполнения команды, обычно по одной строке за раз. После завершения он возвращает объект на 3-й порт. Например, успешная команда должна вернуть <code>{code: 0}</code>.
   </p>
   <p>
-    Ошибки могут возвращать дополнительную информацию на 3-м порту в <code>msg.payload</code>, такую как строка <code>message</code>, строка <code>signal</code>.
+    Ошибки могут возвращать на 3-й порт дополнительную информацию в <code>msg.payload</code>, такую как строка <code>message</code>, строка <code>signal</code>.
   </p>
   <p>
     Выполняемая команда настраивается в узле, с возможностью добавления к ней <code>msg.payload</code> и дополнительного набора параметров.
@@ -82,25 +82,25 @@
     Команды или параметры с пробелами должны быть заключены в кавычки - <code>"Это один параметр"</code>
   </p>
   <p>
-    Возвращаемый <code>payload</code> обычно представляет собой <i>строку</i>, пока не обнаружены символы, отличные от UTF8, в этом случае это <i>буфер</i>.
+    Возвращаемый <code>payload</code> обычно представляет собой <i>строку</i>, пока не обнаружены символы, отличные от UTF8, в этом случае возвращаемое значение будет иметь тип <i>буфер</i>.
   </p>
   <p>
-    Значок состояния узла и PID будут видны, пока узел активен. Изменения в статусе могут быть прочитаны узлом <code>Status</code>.
+    Значок статуса узла и PID будут видны, когда узел активен. Изменения в статусе можно отслеживать узлом <code>Status</code>.
   </p>
 
   <h4>
     Уничтожения процессов
   </h4>
   <p>
-    Отправка <code>msg.kill</code> уничтожит один активный процесс. <code>msg.kill</code> должен быть строкой, содержащей тип передаваемого сигнала, например, <code>SIGINT</code>, <code>SIGQUIT</code> или <code>SIGHUP</code>. По умолчанию <code>SIGTERM</code>, если задана пустая строка.
+    Отправка <code>msg.kill</code> уничтожит один активный процесс. <code>msg.kill</code> должен быть строкой, содержащей тип передаваемого сигнала, например, <code>SIGINT</code>, <code>SIGQUIT</code> или <code>SIGHUP</code>. По умолчанию будет передан <code>SIGTERM</code>, если задана пустая строка.
   </p>
   <p>
-    Если узлом запущено более одного процесса, тогда в <code>msg.pid</code> также должно быть установлено значение PID для уничтожения.
+    Если узлом запущено более одного процесса, тогда в <code>msg.pid</code> также должно быть установлено значение PID процесса для уничтожения.
   </p>
   <p>
-    Если в поле <code>Тайм-аут</code> указано значение, то, если процесс не завершится по истечении указанного количества секунд, он будет автоматически уничтожен
+    Если в поле <code>Тайм-аут</code> введено значение, тогда, если процесс не завершится по истечении указанного количества секунд, он будет автоматически уничтожен.
   </p>
   <p>
-    Совет: если Вы запускаете Python приложение, Вам может потребоваться использовать параметр <code>-u</code>, чтобы остановить буферизацию вывода.
+    Совет: если вы запускаете Python приложение, вам может потребоваться использование параметра <code>-u</code>, чтобы остановить буферизацию вывода.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/messages.json b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
index 63e597526..08e2b6b73 100755
--- a/packages/node_modules/@node-red/nodes/locales/ru/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ru/messages.json
@@ -46,7 +46,7 @@
             "bool": "логический тип",
             "json": "объект",
             "bin": "буфер",
-            "date": "отметка времени",
+            "date": "метка времени",
             "env": "переменная среды",
             "object": "объект",
             "string": "строка",
@@ -55,7 +55,7 @@
             "Array": "массив",
             "invalid": "Неверный объект JSON"
         },
-        "timestamp": "отметка времени",
+        "timestamp": "метка времени",
         "none": "нет",
         "interval": "с интервалом",
         "interval-time": "с интервалом в промежутке",
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/05-tls.html b/packages/node_modules/@node-red/nodes/locales/ru/network/05-tls.html
index 33c790ed0..4818af0fb 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/05-tls.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/05-tls.html
@@ -15,5 +15,5 @@
 -->
 
 <script type="text/html" data-help-name="tls-config">
-  <p>Параметры конфигурации для соединений TLS.</p>
+  <p>Параметры конфигурации для TLS соединений.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/06-httpproxy.html b/packages/node_modules/@node-red/nodes/locales/ru/network/06-httpproxy.html
index 85fe4eb81..fb7b5ddc9 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/06-httpproxy.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/06-httpproxy.html
@@ -21,6 +21,6 @@
 
   <h3>Подробности</h3>
   <p>
-    При доступе к хосту, находящемуся в списке игнорируемых хостов, прокси не будет использоваться.
+    При обращении к хосту, находящемуся в списке игнорируемых хостов, прокси не будет использоваться.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ru/network/10-mqtt.html
index ce10a9515..fab155c5a 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/10-mqtt.html
@@ -13,7 +13,7 @@
 
 <script type="text/html" data-help-name="mqtt in">
   <p>
-    Подключается к брокеру MQTT и подписывается на сообщения из указанной темы.
+    Подключается к MQTT брокеру и подписывается на сообщения указанной темы.
   </p>
 
   <h3>Выводит</h3>
@@ -36,13 +36,13 @@
     Для этого узла требуется соединение с брокером MQTT. Это настраивается нажатием на значок карандаша.
   </p>
   <p>
-    Несколько узлов MQTT (in или out) могут совместно использовать одно и то же соединение с брокером, если это необходимо.
+    Несколько MQTT узлов (in или out) могут совместно использовать одно и то же соединение с брокером, если это необходимо.
   </p>
 </script>
 
 <script type="text/html" data-help-name="mqtt out">
   <p>
-    Подключается к брокеру MQTT и публикует сообщения.
+    Подключается к MQTT брокеру и публикует сообщения.
   </p>
 
   <h3>Принимает</h3>
@@ -80,13 +80,13 @@
 
 <script type="text/html" data-help-name="mqtt-broker">
   <p>
-    Конфигурация для подключения к брокеру MQTT.
+    Конфигурация для подключения к MQTT брокеру.
   </p>
   <p>
     Эта конфигурация создаст одно соединение с посредником, которое затем может быть повторно использовано узлами <code>MQTT In</code> и <code>MQTT Out</code>.
   </p>
   <p>
-    Узел сгенерирует случайный идентификатор клиента, если он не задан, а узел настроен на использование соединения с чистым сеансом. Если идентификатор клиента установлен, он должен быть уникальным для брокера, к которому Вы подключаетесь.
+    Узел сгенерирует случайный идентификатор клиента, если он не задан, а узел настроен на использование соединения с чистым сеансом. Если идентификатор клиента установлен, он должен быть уникальным для брокера, к которому вы подключаетесь.
   </p>
 
   <h4>Birth сообщение</h4>
@@ -96,7 +96,7 @@
 
   <h4>Close сообщение</h4>
   <p>
-    Это сообщение будет опубликовано в настроенной теме перед тем, как соединение будет закрыто нормально, либо путем повторного развертывания узла, либо остановкой.
+    Это сообщение будет опубликовано в настроенной теме перед тем, как соединение будет закрыто обычным образом, либо путем повторного развертывания узла, либо остановкой.
   </p>
 
   <h4>Will сообщение</h4>
@@ -106,7 +106,7 @@
 
   <h4>WebSockets</h4>
   <p>
-    Узел может быть настроен на использование соединения WebSocket. Для этого в поле Сервер должен быть указан полный URI для соединения. Например:
+    Узел может быть настроен на использование WebSocket соединения. Для этого в поле Сервер должен быть указан полный URI для соединения. Например:
   </p>
   <pre>ws://example.com:4000/mqtt</pre>
 
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/21-httpin.html b/packages/node_modules/@node-red/nodes/locales/ru/network/21-httpin.html
index 2527c1599..fca62768f 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/21-httpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/21-httpin.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="http in">
   <p>
-    Создает конечную точку HTTP для создания веб-сервисов.
+    Создает конечную точку HTTP для веб-службы.
   </p>
 
   <h3>Выводит</h3>
@@ -35,12 +35,12 @@
       </ul>
     </dd>
     <dt>res<span class="property-type">объект</span></dt>
-    <dd>Объект ответа HTTP. Это свойство не должно использоваться напрямую; узел ответа <code>HTTP Response</code> описывает, как ответить на запрос. Это свойство должно оставаться в сообщении, передаваемому узлу ответа.</dd>
+    <dd>Объект ответа HTTP. Это свойство не должно использоваться напрямую. Для ответа на входящий HTTP запрос используется узел ответа <code>HTTP Response</code>. Это свойство должно оставаться в сообщении вплоть до передачи узлу ответа.</dd>
   </dl>
 
   <h3>Подробности</h3>
   <p>
-    По настроенному пути узел будет слушать запросы определенного типа. Путь может быть указан полностью, например <code>/user</code>, или включать именованные параметры, которые принимают любое значение, например <code>/user/:name</code>. Когда используются именованные параметры, их фактическое значение в запросе будет доступно в <code>msg.req.params</code>.
+    По настроенному пути узел будет принимать запросы определенного типа. Путь может быть указан конкретно, например <code>/user</code>, или включать именованные параметры, которые принимают любое значение, например <code>/user/:name</code>. Когда используются именованные параметры, их фактическое значение в запросе будет доступно в <code>msg.req.params</code>.
   </p>
   <p>
     Для запросов, которые содержат тело, такие как POST или PUT, содержимое запроса доступно в <code>msg.payload</code>.
@@ -67,7 +67,7 @@
     <dt class="optional">headers <span class="property-type">объект</span></dt>
     <dd>Если установлено, предоставляет заголовки HTTP для включения в ответ.</dd>
     <dt class="optional">cookies <span class="property-type">объект</span></dt>
-    <dd>Если установлено, может использоваться для установки или удаления куков.</dd>
+    <dd>Если установлено, может использоваться для записи или удаления куков.</dd>
   </dl>
 
   <h3>Подробности</h3>
@@ -80,7 +80,7 @@
     Свойство <code>cookies</code> должно быть объектом пар имя/значение. Значением может быть либо строка для установки значения куки с параметрами по умолчанию, либо это может быть объект параметров.
   </p>
   <p>
-    В следующем примере устанавливаются два куки - один с именем <code>name</code> со значением <code>nick</code>, другой с именем <code>session</code> со значением <code>1234</code> и сроком действия в 15 минут.
+    В следующем примере устанавливаются два куки - один с именем <code>name</code> и значением <code>nick</code>, другой с именем <code>session</code> и значением <code>1234</code> и сроком действия в 15 минут.
   </p>
   <pre>
 msg.cookies = {
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/ru/network/21-httprequest.html
index 12662aacf..32376bd59 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/21-httprequest.html
@@ -32,7 +32,7 @@
     <dt class="optional">payload</dt>
     <dd>Отправляется как тело запроса.</dd>
     <dt class="optional">rejectUnauthorized</dt>
-    <dd>Если установлено значение <code>false</code>, разрешает отправлять запросы на сайты https, которые используют самозаверяющие сертификаты.</dd>
+    <dd>Если установлено значение <code>false</code>, разрешает отправлять запросы на сайты https, которые используют самозаверенные сертификаты.</dd>
     <dt class="optional">followRedirects</dt>
     <dd>Если установлено значение <code>false</code>, запрещает переадресацию (HTTP 301). По умолчанию <code>true</code>.</dd>
     <dt class="optional">requestTimeout</dt>
@@ -68,20 +68,20 @@
 
   <h4>Использование нескольких узлов HTTP-запросов</h4>
   <p>
-    Чтобы использовать более одного из этих узлов в одном потоке, нужно позаботиться о свойстве <code>msg.headers</code>. Первый узел установит это свойство с заголовками ответа. Затем следующий узел будет использовать эти заголовки для своего запроса - обычно это неправильный подход. Если свойство <code>msg.headers</code> остается неизменным между узлами, оно будет проигнорировано вторым узлом. Чтобы установить пользовательские заголовки, сначала необходимо удалить <code>msg.headers</code> или сбросить до пустого объекта: <code>{}</code>.
+    Чтобы использовать несколько таких узлов в одном потоке, нужно позаботиться о свойстве <code>msg.headers</code>. Первый узел установит это свойство с заголовками ответа. Затем следующий узел будет использовать эти заголовки для своего запроса - обычно это неправильный подход. Если свойство <code>msg.headers</code> остается неизменным между узлами, оно будет проигнорировано вторым узлом. Чтобы установить свои заголовки, сначала необходимо удалить <code>msg.headers</code> или сбросить это свойство до пустого объекта: <code>{}</code>.
   </p>
 
   <h4>Обработка куки</h4>
   <p>
-    Свойство <code>cookies</code>, передаваемое узлу, должно быть объектом пар имя/значение. Значением может быть либо строка для установки значения куки, либо это может быть объект с единственным свойством <code>value</code>.
+    Свойство <code>cookies</code>, передаваемое узлу, должно быть объектом из пар имя/значение. Значением может быть либо строка для установки значения куки, либо это может быть объект с единственным свойством <code>value</code>.
   </p>
   <p>
-    Все куки, возвращаемые запросом, передаются обратно в свойство <code>responseCookies</code>.
+    Все куки, возвращаемые запросом, передаются обратно в свойстве <code>responseCookies</code>.
   </p>
 
   <h4>Обработка типов контента</h4>
   <p>
-    Если <code>msg.payload</code> является объектом, узел автоматически установит тип содержимого запроса в <code>application/json</code> и закодирует тело как таковое.
+    Если <code>msg.payload</code> является объектом, узел автоматически установит тип содержимого запроса в <code>application/json</code> и закодирует тело соответствующим образом.
   </p>
   <p>
     Чтобы закодировать запрос как данные формы, для <code>msg.headers["content-type"]</code> должно быть установлено <code>application/x-www-form-urlencoded</code>.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/22-websocket.html b/packages/node_modules/@node-red/nodes/locales/ru/network/22-websocket.html
index 243f71107..585c75f1c 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/22-websocket.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/22-websocket.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="websocket in">
   <p>
-    Входной узел WebSocket.
+    Входящий узел WebSocket.
   </p>
   <p>
     По умолчанию данные, полученные из WebSocket, будут в <code>msg.payload</code>. Сокет можно настроить так, чтобы он ожидал правильно сформированную строку JSON. В этом случае он будет анализировать JSON и отправлять полученный объект как полное сообщение.
@@ -25,17 +25,17 @@
 
 <script type="text/html" data-help-name="websocket out">
   <p>
-    Выходной узел WebSocket.
+    Исходящий узел WebSocket.
   </p>
   <p>
     По умолчанию <code>msg.payload</code> будет отправлено через WebSocket. Сокет может быть сконфигурирован для кодирования всего объекта <code>msg</code> в виде строки JSON и отправки его через WebSocket.
   </p>
 
   <p>
-    Если сообщение, поступающее на этот узел, началось с узла WebSocket In, сообщение будет отправлено обратно клиенту, который запустил поток. В противном случае сообщение будет передано всем подключенным клиентам.
+    Если сообщение, поступающее на этот узел, было начато в потоке узлом WebSocket In, сообщение будет отправлено обратно клиенту, который запустил поток. В противном случае сообщение будет передано всем подключенным клиентам.
   </p>
   <p>
-    Если Вы хотите передать сообщение, которое началось на узле WebSocket In, всем подключенным клиентам, тогда Вы должны удалить свойство <code>msg._session</code> в потоке.
+    Если Вы хотите передать сообщение, которое началось с узла WebSocket In, всем подключенным клиентам, тогда вам нужно удалить свойство <code>msg._session</code> перед тем как передавать его этому узлу.
   </p>
 </script>
 
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/locales/ru/network/31-tcpin.html
index f23bd974a..7a3dcf2f3 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/31-tcpin.html
@@ -16,16 +16,16 @@
 
 <script type="text/html" data-help-name="tcp in">
   <p>
-    Предоставляет выбор TCP-входов. Можно либо подключаться к удаленному TCP-порту, либо принимать входящие подключения.
+    Предоставляет выбор из нескольких входящих TCP-узлов. Можно либо подключаться к удаленному TCP-порту, либо принимать входящие подключения.
   </p>
   <p>
-    <b>Примечание.</b> В некоторых системах Вам могут потребоваться права root или администратора для доступа к портам ниже 1024.
+    <b>Примечание.</b> В некоторых системах вам могут потребоваться права root или администратора для доступа к портам ниже 1024.
   </p>
 </script>
 
 <script type="text/html" data-help-name="tcp out">
   <p>
-    Предоставляет выбор TCP-выходов. Может подключаться к удаленному TCP-порту, принимать входящие подключения или отвечать на сообщения, полученные от узла TCP In.
+    Предоставляет выбор из нескольких исходящих TCP-узлов. Может подключаться к удаленному TCP-порту, принимать входящие подключения или отвечать на сообщения, полученные от узла TCP In.
   </p>
   <p>
     Отправляются только данные <code>msg.payload</code>.
@@ -37,21 +37,21 @@
     Если <code>msg._session</code> отсутствует, данные отправляется <b>всем</b> подключенным клиентам.
   </p>
   <p>
-    <b>Примечание.</b> В некоторых системах Вам могут потребоваться права root или администратора для доступа к портам ниже 1024.
+    <b>Примечание.</b> В некоторых системах вам могут потребоваться права root или администратора для доступа к портам ниже 1024.
   </p>
 </script>
 
 <script type="text/html" data-help-name="tcp request">
   <p>
-    Простой узел TCP-запроса - отправляет <code>msg.payload</code> на tcp-порт сервера и ожидает ответа.
+    Узел TCP-запроса - отправляет <code>msg.payload</code> на tcp-порт сервера и ожидает ответа.
   </p>
   <p>
     Подключается, отправляет &quot;запрос&quot; и читает &quot;ответ&quot;. Он может либо подсчитать количество возвращенных символов в фиксированный буфер, сопоставить указанный символ перед возвратом, дождаться фиксированного времени ожидания от первого ответа и затем вернуться, сидеть и дожидаться данных, или отправить, а затем немедленно закрыть соединение, не дожидаясь ответа.
   </p>
   <p>
-    Ответ будет выведен в <code>msg.payload</code> в виде буфера, поэтому Вы можете захотеть применить к нему .toString().
+    Ответ будет возвращен в <code>msg.payload</code> в виде буфера, поэтому вам может понадобиться применить к нему .toString(), если нужно преобразование в строку.
   </p>
   <p>
-    Если Вы оставите tcp-хост или порт пустыми, они должны быть установлены с помощью свойств <code>msg.host</code> и <code>msg.port</code> в каждом сообщении, отправляемом узлу.
+    Если вы оставите tcp-хост или порт пустыми, они должны быть установлены с помощью свойств <code>msg.host</code> и <code>msg.port</code> в каждом сообщении, отправляемом узлу.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/network/32-udp.html b/packages/node_modules/@node-red/nodes/locales/ru/network/32-udp.html
index 2a1026e8b..d014c4279 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/network/32-udp.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/network/32-udp.html
@@ -16,13 +16,13 @@
 
 <script type="text/html" data-help-name="udp in">
   <p>
-    Входной узел UDP, который создает <code>msg.payload</code>, содержащий буфер, строку или base64-строку. Поддерживает многоадресную рассылку.
+    Входящий UDP-узел, который создает <code>msg.payload</code>, содержащий буфер, строку или base64-строку. Поддерживает многоадресную рассылку.
   </p>
   <p>
     Он также предоставляет <code>msg.ip</code> и <code>msg.port</code> для IP-адреса и порта, с которого было получено сообщение.
   </p>
   <p>
-    <b>Примечание</b>. В некоторых системах Вам могут потребоваться права root или администратора для доступа к портам ниже 1024 и/или широковещательной рассылки.
+    <b>Примечание</b>. В некоторых системах вам могут потребоваться права root или администратора для доступа к портам ниже 1024 и/или широковещательной рассылки.
   </p>
 </script>
 
@@ -37,6 +37,6 @@
     Если Вы выберете широковещательную рассылку, то либо задайте в качестве адреса локальный широковещательный IP-адрес, либо попробуйте 255.255.255.255, который является глобальным широковещательным адресом.
   </p>
   <p>
-    <b>Примечание</b>. В некоторых системах Вам могут потребоваться права root или администратора для доступа к портам ниже 1024 и/или широковещательной рассылки.
+    <b>Примечание</b>. В некоторых системах вам могут потребоваться права root или администратора для доступа к портам ниже 1024 и/или широковещательной рассылки.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-CSV.html b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-CSV.html
index de94a1fd8..66186eb7e 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-CSV.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-CSV.html
@@ -30,10 +30,10 @@
     <dt>payload<span class="property-type">объект | массив | строка</span></dt>
     <dd>
       <ul>
-        <li>Если вход является значением строкового типа, узел пытается проанализировать ее как CSV и создает объект JavaScript из пар ключ/значение для каждой строки. Затем узел либо отправит сообщение для каждой строки или одно сообщение, содержащее массив объектов.</li>
-        <li>Если вход является JavaScript объектом, узел пытается построить CSV-строку.</li>
-        <li>Если вход является массивом простых значений, узел построит однострочную CSV-строку.</li>
-        <li>Если вход является массивом массивов или массивом объектов, создается многострочная CSV-строка.</li>
+        <li>Если на входе значение строкового типа, узел попытается проанализировать его как CSV и создает объект JavaScript из пар ключ/значение для каждой строки. Затем узел либо отправит сообщение для каждой строки или одно сообщение, содержащее массив объектов.</li>
+        <li>Если на входе JavaScript объект, узел попробует построить CSV-строку.</li>
+        <li>Если на входе массив простых значений, узел построит однострочную CSV-строку.</li>
+        <li>Если на входе массив массивов или массив объектов, создается многострочная CSV-строка.</li>
       </ul>
     </dd>
   </dl>
@@ -46,7 +46,7 @@
     При преобразовании в CSV шаблон столбцов используется для определения того, какие свойства извлекать из объекта и в каком порядке.
   </p>
   <p>
-    Если шаблон пуст, то узел может использовать простой список свойств, разделенных запятыми, предоставленных в <code>msg.columns</code>, чтобы определить, что извлечь. Если этого нет, то все свойства объекта выводятся в том порядке, в котором они были найдены в первой строке.
+    Если шаблон пуст, то узел может использовать простой список свойств, разделенных запятыми, предоставленных в <code>msg.columns</code>, чтобы определить, что извлечь. Если его нет, то все свойства объекта выводятся в том порядке, в котором они были найдены в первой строке.
   </p>
   <p>
     Если входные данные являются массивом, то шаблон столбцов используется только для необязательного генерирования строки с заголовками столбцов.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-JSON.html b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-JSON.html
index 0b663ed05..a2dc2da78 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-JSON.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-JSON.html
@@ -37,7 +37,7 @@
       </ul>
     </dd>
     <dt>schemaError<span class="property-type">массив</span></dt>
-    <dd>Если проверка JSON-схемы завершится неудачно, узел catch будет иметь свойство <code>schemaError</code>, содержащее массив ошибок.</dd>
+    <dd>Если проверка JSON-схемы завершится неудачно, узлом catch можно получить свойство <code>schemaError</code>, содержащее массив ошибок.</dd>
   </dl>
 
   <h3>Подробности</h3>
@@ -45,10 +45,10 @@
     По умолчанию узел работает с <code>msg.payload</code>, но его можно настроить для преобразования любого свойства сообщения.
   </p>
   <p>
-    Узел также может быть сконфигурирован для обеспечения конкретной кодировки вместо переключения между ними. Это можно использовать, например, с узлом <code>HTTP In</code>, чтобы гарантировать, что данные payload являются объектом, даже если входящий запрос неправильно установил свой тип содержимого для узла HTTP In, чтобы выполнить преобразование.
+    Узел также может быть сконфигурирован для обеспечения конкретной кодировки вместо переключения между ними. Это можно использовать, например, при работе с узлом <code>HTTP In</code>, чтобы гарантировать, что данные payload всегда будут являться объектом, даже если входящий запрос неправильно установил свой тип содержимого для узла HTTP In, чтобы выполнить преобразование.
   </p>
   <p>
-    Если узел настроен на то, чтобы свойство кодировалось как строка, и он получает строку, дальнейшие проверки этого свойства выполняться не будут. Он не будет проверять, является ли строка допустимым JSON, и не будет переформатировать ее, если выбрана опция форматирования.
+    Если узел настроен так, чтобы свойство кодировалось как строка, и он получает строку, дальнейшие проверки этого свойства выполняться не будут. Он не будет проверять, является ли строка допустимым JSON, и не будет переформатировать ее, если выбрана опция форматирования.
   </p>
   <p>
     Подробнее о JSON-схеме Вы можете узнать в спецификации <a href="http://json-schema.org/latest/json-schema-validation.html">здесь</a>.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-XML.html
index ed6fe6c44..d600826bd 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-XML.html
@@ -32,8 +32,8 @@
     <dt>payload<span class="property-type">объект | строка</span></dt>
     <dd>
       <ul>
-        <li>Если вход является значением строкового типа, узел пытается проанализировать ее как XML и создает объект JavaScript.</li>
-        <li>Если вход является JavaScript объектом, узел пытается построить XML-строку.</li>
+        <li>Если на входе значение строкового типа, узел пытается проанализировать его как XML и создает объект JavaScript.</li>
+        <li>Если на входе JavaScript объект, узел пытается построить XML-строку.</li>
       </ul>
     </dd>
   </dl>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-YAML.html
index b0049330b..8d8ac5f9b 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/parsers/70-YAML.html
@@ -30,8 +30,8 @@
     <dt>payload<span class="property-type">объект | строка</span></dt>
     <dd>
       <ul>
-        <li>Если вход является YAML-строкой, узел пытается проанализировать ее как JavaScript объект.</li>
-        <li>Если вход является JavaScript объектом, узел создает YAML-строку.</li>
+        <li>Если на входе YAML-строка, узел пытается проанализировать ее как JavaScript объект.</li>
+        <li>Если на входе JavaScript объект, узел создает YAML-строку.</li>
       </ul>
     </dd>
   </dl>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/sequence/17-split.html b/packages/node_modules/@node-red/nodes/locales/ru/sequence/17-split.html
index cf7397157..717c6de75 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/sequence/17-split.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/sequence/17-split.html
@@ -24,7 +24,7 @@
     <dt>payload<span class="property-type">объект | строка | массив | буфер</span></dt>
     <dd>Поведение узла определяется типом <code>msg.payload</code>:
       <ul>
-        <li><b>строка</b>/<b>буфер</b> - сообщение разделяется с помощью указанного символа (по умолчанию: <code>\n</code>), последовательности буфера или фиксированной длины.</li>
+        <li><b>строка</b>/<b>буфер</b> - сообщение разделяется с помощью указанного символа (по умолчанию: <code>\n</code>), последовательности буфера или по фиксированной длине.</li>
         <li><b>массив</b> - сообщение разбивается на отдельные элементы массива или массивы фиксированной длины.</li>
         <li><b>объект</b> - сообщение отправляется для каждой пары ключ/значение объекта.</li>
       </ul>
@@ -34,7 +34,7 @@
   <h3>Выводит</h3>
   <dl class="message-properties">
     <dt>parts<span class="property-type">объект</span></dt>
-    <dd>Это свойство содержит информацию о том, как сообщение было отделено от исходного сообщения. При передаче на узел <b>join</b> последовательность может быть собрана в одно сообщение. Свойство имеет следующие свойства:
+    <dd>Это свойство содержит информацию о том, как сообщение было отделено от исходного сообщения. При передаче на узел <b>join</b> последовательность может быть собрана обратно в одно сообщение. Объект содержит следующие свойства:
       <ul>
         <li><code>id</code> - идентификатор группы сообщений</li>
         <li><code>index</code> - позиция в группе</li>
@@ -49,7 +49,7 @@
 
   <h3>Подробности</h3>
   <p>
-    Этот узел облегчает создание потока, который выполняет общие действия над последовательностью сообщений, перед тем как с помощью узла <b>join</b> объединить последовательность в одно сообщение.
+    Этот узел облегчает создание потока, который выполняет общие действия над последовательностью сообщений, перед тем как с помощью узла <b>join</b> объединить последовательность обратно в одно сообщение.
   </p>
   <p>
     Он использует свойство <code>msg.parts</code> для отслеживания отдельных частей последовательности.
@@ -60,7 +60,7 @@
     Узел также может использоваться для переформатирования потока сообщений. Например, последовательное устройство, которое отправляет завершенные новой строкой команды, может доставлять одно сообщение с частичной командой в конце. В 'потоковом режиме' этот узел будет разбивать сообщение и отправлять каждый завершенный сегмент. Если в конце есть частичный сегмент, узел удержит его и добавит к следующему полученному сообщению.
   </p>
   <p>
-    При работе в этом режиме узел не будет устанавливать свойство <code>msg.parts.count</code>, так как он не знает, сколько сообщений ожидать в потоке. Это означает, что его нельзя использовать с узлом <b>join</b> в его автоматическом режиме.
+    При работе в этом режиме узел не будет устанавливать свойство <code>msg.parts.count</code>, так как он не знает, сколько сообщений ожидать в потоке. Это означает, что его нельзя использовать вместе с узлом <b>join</b> в его автоматическом режиме.
   </p>
 </script>
 
@@ -73,7 +73,7 @@
   </p>
   <dl>
     <dt>автоматический</dt>
-    <dd>При использовании с узлом <b>split</b> он автоматически объединит сообщения, чтобы отменить выполненное разделение.</dd>
+    <dd>При использовании с узлом <b>split</b> он автоматически объединит сообщения, чтобы восстановить структуру сообщения, которая была до разделения.</dd>
     <dt>ручной</dt>
     <dd>Объединяет последовательности сообщений различными способами.</dd>
     <dt>агрегация последовательности</dt>
@@ -103,7 +103,7 @@
   <h3>Подробности</h3>
   <h4>Автоматический режим</h4>
   <p>
-    В автоматическом режиме используется свойство <code>parts</code> входящих сообщений, чтобы определить способ объединения последовательности. Это позволяет автоматически отменять действие узла <b>split</b>.
+    В автоматическом режиме используется свойство <code>parts</code> входящих сообщений, чтобы определить способ объединения последовательности. Это позволяет автоматически выполнять обратное действие для узла <b>split</b>.
   </p>
 
   <h4>Ручной режим</h4>
@@ -123,7 +123,7 @@
     Свойство <i>кол-во</i> может быть установлено для количества сообщений, которое должно быть получено перед генерацией выходного сообщения. Для выходных данных объекта, когда это число достигнуто, узел может быть настроен на отправку сообщения для каждого последующего полученного сообщения.
   </p>
   <p>
-    Свойство <i>время (сек)</i> может быть установлено, чтобы инициировать отправку нового сообщения с использованием того, что было получено до сих пор.
+    Свойство <i>время (сек)</i> может быть установлено, чтобы инициировать отправку нового сообщения с использованием всего, что было получено до сих пор.
   </p>
   <p>
     Если сообщение получено с установленным свойством <b>msg.complete</b>, выходное сообщение завершается и отправляется. Это сбрасывает любой подсчет частей.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/sequence/18-sort.html b/packages/node_modules/@node-red/nodes/locales/ru/sequence/18-sort.html
index efd183854..64efa3967 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/sequence/18-sort.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/sequence/18-sort.html
@@ -48,7 +48,7 @@
     </ul>
   </p>
   <p>
-    <b>Примечание.</b> Этот узел внутренне хранит сообщения для своей работы. Чтобы предотвратить непредвиденное использование памяти, можно указать максимальное количество хранимых сообщений. По умолчанию количество сообщений не ограничено.
+    <b>Примечание.</b> Этот узел буферизирует сообщения внутри для своей работы. Чтобы предотвратить непредвиденное использование памяти, можно указать максимальное количество хранимых сообщений. По умолчанию количество сообщений не ограничено.
     <ul>
       <li>Свойство <code>nodeMessageBufferMaxLength</code> устанавливается в <b>settings.js</b>.</li>
     </ul>
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/sequence/19-batch.html b/packages/node_modules/@node-red/nodes/locales/ru/sequence/19-batch.html
index ecda13154..2589233be 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/sequence/19-batch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/sequence/19-batch.html
@@ -37,7 +37,7 @@
 
   <h4>Хранение сообщений</h4>
   <p>
-    Этот узел будет буферизировать сообщения внутри, чтобы работать между последовательностями. Параметр <code>nodeMessageBufferMaxLength</code> можно использовать для ограничения количества сообщений, которые узел будут буферизовать.
+    Этот узел будет буферизировать сообщения внутри, чтобы работать с последовательностями. Параметр <code>nodeMessageBufferMaxLength</code> можно использовать для ограничения количества сообщений, которые узел будут буферизовать.
   </p>
   <p>
     Если сообщение получено с установленным свойством <b>msg.reset</b>, буферизованные сообщения удаляются и не отправляются.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/storage/10-file.html b/packages/node_modules/@node-red/nodes/locales/ru/storage/10-file.html
index e1c8bf456..8a4a64f24 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/storage/10-file.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/storage/10-file.html
@@ -16,7 +16,7 @@
 
 <script type="text/html" data-help-name="file">
   <p>
-    Записывает <code>msg.payload</code> в файл, либо добавляя в конец, либо заменяя существующий контент. Кроме того, он может удалить файл.
+    Записывает <code>msg.payload</code> в файл, либо добавлением в конец, либо заменой существующего контента. Кроме того, им можно удалять файл.
   </p>
 
   <h3>Принимает</h3>
@@ -38,7 +38,7 @@
     Если используется <code>msg.filename</code>, файл будет закрыт после каждой записи. Для лучшей производительности используйте фиксированное имя файла.
   </p>
   <p>
-    Он может быть настроен на перезапись всего файла, а не на добавление. Например, при записи двоичных данных в файл, например изображение, следует использовать эту опцию и отключить опцию добавления новой строки.
+    Он может быть настроен на перезапись всего файла, а не на добавление. Например, при записи двоичных данных (типа изображения) в файл, следует использовать эту опцию и отключить опцию добавления новой строки.
   </p>
   <p>
     Кодировка данных, записанных в файл, может быть выбрана в списке кодировок.
@@ -50,13 +50,13 @@
 
 <script type="text/html" data-help-name="file in">
   <p>
-    Читает содержимое файла как строковый тип или двоичный буфер.
+    Читает содержимое файла как строку или двоичный буфер.
   </p>
 
   <h3>Принимает</h3>
   <dl class="message-properties">
     <dt class="optional">filename <span class="property-type">строка</span></dt>
-    <dd>если не задано в конфигурации узла, это свойство устанавливает имя файла для чтения.</dd>
+    <dd>это свойство устанавливает имя файла для чтения, если оно не задано в настройках узла.</dd>
   </dl>
 
   <h3>Выводит</h3>
@@ -69,13 +69,13 @@
 
   <h3>Подробности</h3>
   <p>
-    Имя файла должно быть абсолютным путем, иначе оно будет относительно рабочего каталога процесса Node-RED.
+    Имя файла должно быть абсолютным путем к файлу, иначе оно будет путем относительно рабочего каталога процесса Node-RED.
   </p>
   <p>
     В Windows может быть необходимо кодировать разделители пути двойной косой чертой, например: <code>\\Users\\myUser</code>.
   </p>
   <p>
-    При желании текстовый файл можно разбить на строки, выводя по одному сообщению на строку, или двоичный файл разбить на более мелкие фрагменты буфера - размер блока зависит от операционной системы, но обычно составляет 64 КБ (Linux/Mac) или 41 КБ (Windows).
+    При желании текстовый файл можно разбить на строки, выводя по одному сообщению для каждой строки, или двоичный файл разбить на более мелкие фрагменты буфера - размер блока зависит от операционной системы, но обычно составляет 64 КБ (Linux/Mac) или 41 КБ (Windows).
   </p>
   <p>
     При разбиении на несколько сообщений каждое сообщение будет иметь свойство <code>parts</code>, формирующее полную последовательность сообщений.
diff --git a/packages/node_modules/@node-red/nodes/locales/ru/storage/23-watch.html b/packages/node_modules/@node-red/nodes/locales/ru/storage/23-watch.html
index 7960f3113..40ad1da70 100644
--- a/packages/node_modules/@node-red/nodes/locales/ru/storage/23-watch.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/storage/23-watch.html
@@ -16,13 +16,13 @@
 
 <script type="text/html" data-help-name="watch">
   <p>
-    Наблюдает за изменениями каталога или файла.
+    Наблюдает за изменениями директории или файла.
   </p>
   <p>
-    Вы можете ввести список разделенных запятыми каталогов и/или файлов. Вам нужно взять в кавычки "..." те из них, в которых есть пробелы.
+    Вы можете ввести список разделенных запятыми директорий и/или файлов. Вам нужно взять в кавычки "..." те из них, в которых есть пробелы.
   </p>
   <p>
-    В Windows Вы должны использовать двойную обратную косую черту \\ в любых именах каталогов.
+    В Windows вы должны использовать двойную обратную косую черту \\ вместо одной в именах директорий.
   </p>
   <p>
     Полное имя фактически измененного файла помещается в <code>msg.payload</code> и <code>msg.filename</code>, а строковая версия списка наблюдения возвращается в <code>msg.topic</code>.
@@ -31,9 +31,9 @@
     <code>msg.file</code> содержит только краткое имя файла, который изменился. <code>msg.type</code> содержит тип измененной единицы, обычно это <i>file</i> для файла или <i>directory</i> для директории, тогда как <code>msg.size</code> содержит размер файла в байтах.
   </p>
   <p>
-    В Linux <i>все</i> является файлом, и может быть под наблюдением...
+    В Linux <i>все</i> является файлами, и может быть под наблюдением...
   </p>
   <p>
-    <b>Примечание.</b> Наблюдаемые каталог или файл должны существовать. Если файл или каталог будет удален, они могут перестать отслеживаться, даже если они будут созданы заново.
+    <b>Примечание.</b> Наблюдаемые директория или файл должны существовать. Если файл или директория будут удалены, они могут перестать отслеживаться, даже если они затем будут созданы заново.
   </p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index bf7f3a362..b3e510f9a 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -23,7 +23,7 @@
         "cookie": "0.4.1",
         "cors": "2.8.5",
         "cron": "1.7.2",
-        "denque": "1.4.1",
+        "denque": "1.5.0",
         "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
         "hash-sum": "2.0.0",
@@ -31,9 +31,9 @@
         "is-utf8": "0.2.1",
         "js-yaml": "3.14.0",
         "media-typer": "1.1.0",
-        "mqtt": "4.2.5",
+        "mqtt": "4.2.6",
         "multer": "1.4.2",
-        "mustache": "4.0.1",
+        "mustache": "4.1.0",
         "on-headers": "1.0.2",
         "raw-body": "2.4.1",
         "request": "2.88.0",
diff --git a/packages/node_modules/@node-red/registry/lib/index.js b/packages/node_modules/@node-red/registry/lib/index.js
index 2805534a2..251b04971 100644
--- a/packages/node_modules/@node-red/registry/lib/index.js
+++ b/packages/node_modules/@node-red/registry/lib/index.js
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright JS Foundation and other contributors, http://js.foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,17 +28,30 @@ var registry = require("./registry");
 var loader = require("./loader");
 var installer = require("./installer");
 var library = require("./library");
+var plugins = require("./plugins");
 
-var settings;
-
+/**
+ * Initialise the registry with a reference to a runtime object
+ * @param  {Object} runtime - a runtime object
+ * @memberof @node-red/registry
+ */
 function init(runtime) {
-    settings = runtime.settings;
-    installer.init(runtime);
+    installer.init(runtime.settings);
+    // Loader requires the full runtime object because it initialises
+    // the util module it. The Util module is responsible for constructing the
+    // RED object passed to node modules when they are loaded.
     loader.init(runtime);
-    registry.init(settings,loader,runtime.events);
+    plugins.init(runtime.settings);
+    registry.init(runtime.settings,loader);
     library.init();
 }
 
+/**
+ * Triggers the intial discovery and loading of all Node-RED node modules.
+ * found on the node path.
+ * @return {Promise} - resolves when the registry has finised discovering node modules.
+ * @memberof @node-red/registry
+ */
 function load() {
     registry.load();
     return installer.checkPrereq().then(loader.load);
@@ -66,36 +79,232 @@ module.exports = {
     init:init,
     load:load,
     clear: registry.clear,
+
+    /**
+     * Register a node constructor function.
+     *
+     * @param {Object} nodeSet - the Node Set object the constructor is for
+     * @param {String} type - the node type
+     * @param {Function} constructor - the node constructor function
+     * @function
+     * @memberof @node-red/registry
+     */
     registerType: registry.registerNodeConstructor,
 
+    /**
+     * Get a node constructor function.
+     *
+     * @param {String} type - the node type
+     * @return {Function} the node constructor function
+     * @function
+     * @memberof @node-red/registry
+     */
     get: registry.getNodeConstructor,
+
+    registerSubflow: registry.registerSubflow,
+
+    /**
+     * Get a node's set information.
+     *
+     * @param {String} type - the node type or set identifier
+     * @return {Object} the node set information
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeInfo: registry.getNodeInfo,
+
+
+    /**
+     * Get a list of all nodes in the registry.
+     *
+     * @return {Object} the node list
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeList: registry.getNodeList,
 
+    /**
+     * Get a modules's information.
+     *
+     * @param {String} type - the module identifier
+     * @return {Object} the module information
+     * @function
+     * @memberof @node-red/registry
+     */
     getModuleInfo: registry.getModuleInfo,
+
+    /**
+     * Get a list of all moduless in the registry.
+     *
+     * @return {Object} the module list
+     * @function
+     * @memberof @node-red/registry
+     */
     getModuleList: registry.getModuleList,
 
+    /**
+     * Get the HTML configs for all nodes in the registry.
+     *
+     * @param {String} lang - the language to return, default `en-US`
+     * @return {String} the node configs
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeConfigs: registry.getAllNodeConfigs,
+
+    /**
+     * Get the HTML config for a single node set.
+     *
+     * @param {String} id - the node identifier
+     * @param {String} lang - the language to return, default `en-US`
+     * @return {String} the node config
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeConfig: registry.getNodeConfig,
+
+    /**
+     * Get the local path to a node's icon file.
+     *
+     * @param {String} module - the module that provides the icon
+     * @param {String} icon - the name of the icon
+     * @return {String} the local path to the icon
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeIconPath: registry.getNodeIconPath,
+
+
+    /**
+     * Get the full list of all icons available.
+     *
+     * @return {String} the icon list
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeIcons: registry.getNodeIcons,
 
+    /**
+     * Enables a node set, making it available for use.
+     *
+     * @param {String} type - the node type or set identifier
+     * @return {Promise} A promise that resolves when the node set has been enabled
+     * @throws if the identifier is not recognised or runtime settings are unavailable
+     * @function
+     * @memberof @node-red/registry
+     */
     enableNode: enableNodeSet,
+
+    /**
+     * Disables a node set, making it unavailable for use.
+     *
+     * @param {String} type - the node type or set identifier
+     * @return {Promise} A promise that resolves when the node set has been disabled
+     * @throws if the identifier is not recognised or runtime settings are unavailable
+     * @function
+     * @memberof @node-red/registry
+     */
     disableNode: registry.disableNodeSet,
 
+
+    /**
+     * Loads a new module into the registry.
+     *
+     * This will rescan the node module paths looking for this module.
+     *
+     * @param {String} module - the name of the module to add
+     * @return {Promise<Object>} A promise that resolves with the module information once it has been added
+     * @throws if the module has already been added or the runtime settings are unavailable
+     * @function
+     * @memberof @node-red/registry
+     */
     addModule: addModule,
+
+    /**
+     * Removes a module from the registry.
+     *
+     * @param {String} module - the name of the module to remove
+     * @return {Promise<Array>} A promise that resolves with the list of removed node sets
+     * @throws if the module is not found or the runtime settings are unavailable
+     * @function
+     * @memberof @node-red/registry
+     */
     removeModule: registry.removeModule,
 
+    /**
+     * Installs a new node module using npm and then add to the registry
+     *
+     * @param {String|Buffer} module - the name of the module to install, or a Buffer containing a module tar file
+     * @param {String} version - the version of the module to install, default: `latest`
+     * @param {String} url - (optional) a url to install the module from
+     * @return {Promise<Array>} A promise that resolves with the module information once it has been installed
+     * @function
+     * @memberof @node-red/registry
+     */
     installModule: installer.installModule,
+
+
+    /**
+     * Uninstalls a module using npm
+     *
+     * @param {String} module - the name of the module to uninstall
+     * @return {Promise<Array>} A promise that resolves when the module has been removed
+     * @function
+     * @memberof @node-red/registry
+     */
     uninstallModule: installer.uninstallModule,
 
+    /**
+     * Update to internal list of available modules based on what has been actually
+     * loaded.
+     *
+     * The `externalModules.autoInstall` (previously `autoInstallModules`)
+     * runtime option means the runtime may try to install
+     * missing modules after the initial load is complete. If that flag is not set
+     * this function is used to remove the modules from the registry's saved list.
+     * @function
+     * @memberof @node-red/registry
+     */
     cleanModuleList: registry.cleanModuleList,
 
-    paletteEditorEnabled: installer.paletteEditorEnabled,
+    /**
+     * Check if the regisrty is able to install/remove modules.
+     *
+     * This is based on whether it has found `npm` on the command-line.
+     * @return {Boolean} whether the installer is enabled
+     *
+     * @function
+     * @memberof @node-red/registry
+     */
+    installerEnabled: installer.installerEnabled,
 
+    /**
+     * Get a list of all example flows provided by nodes in the registry.
+     * @return {Object} an object, indexed by module, listing all example flows
+     *
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeExampleFlows: library.getExampleFlows,
+
+
+    /**
+     * Gets the full path to a node example
+     * @param {String} module - the name of the module providing the example
+     * @param {String} path - the relative path of the example
+     * @return {String} the full path to the example
+     *
+     * @function
+     * @memberof @node-red/registry
+     */
     getNodeExampleFlowPath: library.getExampleFlowPath,
 
+    registerPlugin: plugins.registerPlugin,
+    getPlugin: plugins.getPlugin,
+    getPluginsByType: plugins.getPluginsByType,
+    getPluginList: plugins.getPluginList,
+    getPluginConfigs: plugins.getPluginConfigs,
+
     deprecated: require("./deprecated")
 
 };
diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js
index 19cdd7e27..459220774 100644
--- a/packages/node_modules/@node-red/registry/lib/installer.js
+++ b/packages/node_modules/@node-red/registry/lib/installer.js
@@ -15,33 +15,55 @@
  **/
 
 
-var path = require("path");
-var os = require("os");
-var fs = require("fs-extra");
-var tar = require("tar");
+const path = require("path");
+const os = require("os");
+const fs = require("fs-extra");
+const tar = require("tar");
 
-var registry = require("./registry");
-var library = require("./library");
-var log;
-var exec;
+const registry = require("./registry");
+const registryUtil = require("./util");
+const library = require("./library");
+const {exec,log,events} = require("@node-red/util");
+const child_process = require('child_process');
+const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+let installerEnabled = false;
 
-var events;
-
-var child_process = require('child_process');
-var npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-var paletteEditorEnabled = false;
-
-var settings;
+let settings;
 const moduleRe = /^(@[^/@]+?[/])?[^/@]+?$/;
 const slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/;
 const pkgurlRe = /^(https?|git(|\+https?|\+ssh|\+file)):\/\//;
-const localtgzRe = /^\/.+tgz$/;
+const localtgzRe = /^([a-zA-Z]:|\/).+tgz$/;
 
-function init(runtime) {
-    events = runtime.events;
-    settings = runtime.settings;
-    log = runtime.log;
-    exec = runtime.exec;
+// Default allow/deny lists
+let installAllowList = ['*'];
+let installDenyList = [];
+let installAllAllowed = true;
+let installVersionRestricted = false;
+
+function init(_settings) {
+    settings = _settings;
+    // TODO: This is duplicated in localfilesystem.js
+    //       Should it *all* be managed by util?
+    if (settings.externalModules && settings.externalModules.palette) {
+        if (settings.externalModules.palette.allowList || settings.externalModules.palette.denyList) {
+            installAllowList = settings.externalModules.palette.allowList;
+            installDenyList = settings.externalModules.palette.denyList;
+        }
+    }
+    installAllowList = registryUtil.parseModuleList(installAllowList);
+    installDenyList = registryUtil.parseModuleList(installDenyList);
+    installAllAllowed = installDenyList.length === 0;
+    if (!installAllAllowed) {
+        installAllowList.forEach(function(rule) {
+            installVersionRestricted = installVersionRestricted || (!!rule.version);
+        })
+        if (!installVersionRestricted) {
+            installDenyList.forEach(function(rule) {
+                installVersionRestricted = installVersionRestricted || (!!rule.version);
+            })
+
+        }
+    }
 }
 
 var activePromise = Promise.resolve();
@@ -72,107 +94,126 @@ function checkModulePath(folder) {
         version: moduleVersion
     };
 }
-
-function checkExistingModule(module,version) {
-    var info = registry.getModuleInfo(module);
-    if (info) {
-        if (!version || info.version === version) {
-            var err = new Error("Module already loaded");
-            err.code = "module_already_loaded";
-            throw err;
-        }
-        return true;
-    }
-    return false;
-}
-
-function installModule(module,version,url) {
+async function installModule(module,version,url) {
     if (Buffer.isBuffer(module)) {
         return installTarball(module)
     }
     module = module || "";
-    activePromise = activePromise.then(() => {
+    activePromise = activePromise.then(async function() {
         //TODO: ensure module is 'safe'
-        return new Promise((resolve,reject) => {
-            var installName = module;
-            var isUpgrade = false;
-            try {
-                if (url) {
-                    if (pkgurlRe.test(url) || localtgzRe.test(url)) {
-                        // Git remote url or Tarball url - check the valid package url
-                        installName = url;
-                    } else {
-                        log.warn(log._("server.install.install-failed-url",{name:module,url:url}));
-                        const e = new Error("Invalid url");
-                        e.code = "invalid_module_url";
-                        reject(e);
-                        return;
-                    }
-                } else if (moduleRe.test(module)) {
-                    // Simple module name - assume it can be npm installed
-                    if (version) {
-                        installName += "@"+version;
-                    }
-                } else if (slashRe.test(module)) {
-                    // A path - check if there's a valid package.json
-                    installName = module;
-                    let info = checkModulePath(module);
-                    module = info.name;
-                } else {
-                    log.warn(log._("server.install.install-failed-name",{name:module}));
-                    const e = new Error("Invalid module name");
-                    e.code = "invalid_module_name";
-                    reject(e);
-                    return;
-                }
-                isUpgrade = checkExistingModule(module,version);
-            } catch(err) {
-                return reject(err);
-            }
-            if (!isUpgrade) {
-                log.info(log._("server.install.installing",{name: module,version: version||"latest"}));
+        var installName = module;
+        let isRegistryPackage = true;
+        var isUpgrade = false;
+        var isExisting = false;
+        if (url) {
+            if (pkgurlRe.test(url) || localtgzRe.test(url)) {
+                // Git remote url or Tarball url - check the valid package url
+                installName = url;
+                isRegistryPackage = false;
             } else {
-                log.info(log._("server.install.upgrading",{name: module,version: version||"latest"}));
+                log.warn(log._("server.install.install-failed-url",{name:module,url:url}));
+                const e = new Error("Invalid url");
+                e.code = "invalid_module_url";
+                throw e;
+            }
+        } else if (moduleRe.test(module)) {
+            // Simple module name - assume it can be npm installed
+            if (version) {
+                installName += "@"+version;
+            }
+        } else if (slashRe.test(module)) {
+            // A path - check if there's a valid package.json
+            installName = module;
+            let info = checkModulePath(module);
+            module = info.name;
+            isRegistryPackage = false;
+        } else {
+            log.warn(log._("server.install.install-failed-name",{name:module}));
+            const e = new Error("Invalid module name");
+            e.code = "invalid_module_name";
+            throw e;
+        }
+        if (!installAllAllowed) {
+            let installVersion = version;
+            if (installVersionRestricted && isRegistryPackage) {
+                installVersion = await getModuleVersionFromNPM(module, version);
             }
 
-            var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
-            var args = ['install','--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production',installName];
-            log.trace(npmCommand + JSON.stringify(args));
-            exec.run(npmCommand,args,{
-                cwd: installDir
-            }, true).then(result => {
-                if (!isUpgrade) {
-                    log.info(log._("server.install.installed",{name:module}));
-                    resolve(require("./index").addModule(module).then(reportAddedModules));
-                } else {
-                    log.info(log._("server.install.upgraded",{name:module, version:version}));
-                    events.emit("runtime-event",{id:"restart-required",payload:{type:"warning",text:"notification.warnings.restartRequired"},retain:true});
-                    resolve(require("./registry").setModulePendingUpdated(module,version));
-                }
-            }).catch(result => {
-                var output = result.stderr;
-                var e;
-                var lookFor404 = new RegExp(" 404 .*"+module,"m");
-                var lookForVersionNotFound = new RegExp("version not found: "+module+"@"+version,"m");
-                if (lookFor404.test(output)) {
-                    log.warn(log._("server.install.install-failed-not-found",{name:module}));
-                    e = new Error("Module not found");
-                    e.code = 404;
-                    reject(e);
-                } else if (isUpgrade && lookForVersionNotFound.test(output)) {
-                    log.warn(log._("server.install.upgrade-failed-not-found",{name:module}));
-                    e = new Error("Module not found");
-                    e.code = 404;
-                    reject(e);
-                } else {
-                    log.warn(log._("server.install.install-failed-long",{name:module}));
-                    log.warn("------------------------------------------");
-                    log.warn(output);
-                    log.warn("------------------------------------------");
-                    reject(new Error(log._("server.install.install-failed")));
-                }
-            })
-        });
+            if (!registryUtil.checkModuleAllowed(module,installVersion,installAllowList,installDenyList)) {
+                const e = new Error("Install not allowed");
+                e.code = "install_not_allowed";
+                throw e;
+            }
+        }
+
+        var info = registry.getModuleInfo(module);
+        if (info) {
+            if (!info.user) {
+                log.debug(`Installing existing module: ${module}`)
+                isExisting = true;
+            } else if (!version || info.version === version) {
+                var err = new Error("Module already loaded");
+                err.code = "module_already_loaded";
+                throw err;
+            }
+            isUpgrade = true;
+        } else {
+            isUpgrade = false;
+        }
+
+        if (!isUpgrade) {
+            log.info(log._("server.install.installing",{name: module,version: version||"latest"}));
+        } else {
+            log.info(log._("server.install.upgrading",{name: module,version: version||"latest"}));
+        }
+
+        var installDir = settings.userDir || process.env.NODE_RED_HOME || ".";
+        var args = ['install','--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production',installName];
+        log.trace(npmCommand + JSON.stringify(args));
+        return exec.run(npmCommand,args,{
+            cwd: installDir
+        }, true).then(result => {
+            if (isExisting) {
+                // This is a module we already have installed as a non-user module.
+                // That means it was discovered when loading, but was not listed
+                // in package.json and has been hidden from the editor.
+                // The user has requested to install this module. Having run
+                // the npm install above, it will now be listed in package.json.
+                // Update the registry to mark it as a user module so it will
+                // be available to the editor.
+                log.info(log._("server.install.installed",{name:module}));
+                return require("./registry").setUserInstalled(module,true).then(reportAddedModules);
+            } else if (!isUpgrade) {
+                log.info(log._("server.install.installed",{name:module}));
+                return require("./index").addModule(module).then(reportAddedModules);
+            } else {
+                log.info(log._("server.install.upgraded",{name:module, version:version}));
+                events.emit("runtime-event",{id:"restart-required",payload:{type:"warning",text:"notification.warnings.restartRequired"},retain:true});
+                return require("./registry").setModulePendingUpdated(module,version);
+            }
+        }).catch(result => {
+            var output = result.stderr;
+            var e;
+            var lookFor404 = new RegExp(" 404 .*"+module,"m");
+            var lookForVersionNotFound = new RegExp("version not found: "+module+"@"+version,"m");
+            if (lookFor404.test(output)) {
+                log.warn(log._("server.install.install-failed-not-found",{name:module}));
+                e = new Error("Module not found");
+                e.code = 404;
+                throw e;
+            } else if (isUpgrade && lookForVersionNotFound.test(output)) {
+                log.warn(log._("server.install.upgrade-failed-not-found",{name:module}));
+                e = new Error("Module not found");
+                e.code = 404;
+                throw e;
+            } else {
+                log.warn(log._("server.install.install-failed-long",{name:module}));
+                log.warn("------------------------------------------");
+                log.warn(output);
+                log.warn("------------------------------------------");
+                throw new Error(log._("server.install.install-failed"));
+            }
+        })
     }).catch(err => {
         // In case of error, reset activePromise to be resolvable
         activePromise = Promise.resolve();
@@ -182,7 +223,6 @@ function installModule(module,version,url) {
 }
 
 function reportAddedModules(info) {
-    //comms.publish("node/added",info.nodes,false);
     if (info.nodes.length > 0) {
         log.info(log._("server.added-types"));
         for (var i=0;i<info.nodes.length;i++) {
@@ -221,7 +261,63 @@ async function getExistingPackageVersion(moduleName) {
     return null;
 }
 
+async function getModuleVersionFromNPM(module, version) {
+    let installName = module;
+    if (version) {
+        installName += "@" + version;
+    }
+
+    return new Promise((resolve, reject) => {
+        child_process.execFile(npmCommand,['info','--json',installName],function(err,stdout,stderr) {
+            try {
+                if (!stdout) {
+                    log.warn(log._("server.install.install-failed-not-found",{name:module}));
+                    e = new Error("Version not found");
+                    e.code = 404;
+                    reject(e);
+                    return;
+                }
+                const response = JSON.parse(stdout);
+                if (response.error) {
+                    if (response.error.code === "E404") {
+                        log.warn(log._("server.install.install-failed-not-found",{name:module}));
+                        e = new Error("Module not found");
+                        e.code = 404;
+                        reject(e);
+                    } else {
+                        log.warn(log._("server.install.install-failed-long",{name:module}));
+                        log.warn("------------------------------------------");
+                        log.warn(response.error.summary);
+                        log.warn("------------------------------------------");
+                        reject(new Error(log._("server.install.install-failed")));
+                    }
+                    return;
+                } else {
+                    resolve(response.version);
+                }
+            } catch(err) {
+                log.warn(log._("server.install.install-failed-long",{name:module}));
+                log.warn("------------------------------------------");
+                if (stdout) {
+                    log.warn(stdout);
+                }
+                if (stderr) {
+                    log.warn(stderr);
+                }
+                log.warn(err);
+                log.warn("------------------------------------------");
+                reject(new Error(log._("server.install.install-failed")));
+            }
+        });
+    })
+}
+
+
 async function installTarball(tarball) {
+    if (settings.externalModules && settings.externalModules.palette && settings.externalModules.palette.allowUpload === false) {
+        throw new Error("Module upload disabled")
+    }
+
     // Check this tarball contains a valid node-red module.
     // Get its module name/version
     const moduleInfo = await getTarballModuleInfo(tarball);
@@ -342,27 +438,51 @@ function uninstallModule(module) {
     return activePromise;
 }
 
-function checkPrereq() {
+async function checkPrereq() {
+    if (settings.editorTheme && settings.editorTheme.palette) {
+        if (settings.editorTheme.palette.hasOwnProperty("editable")) {
+            log.warn(log._("server.deprecatedOption",{old:"editorTheme.palette.editable", new:"externalModules.palette.allowInstall"}));
+        }
+        if (settings.editorTheme.palette.hasOwnProperty("upload")) {
+            log.warn(log._("server.deprecatedOption",{old:"editorTheme.palette.upload", new:"externalModules.palette.allowUpload"}));
+        }
+    }
+
+    try {
+        if (settings.editorTheme.palette.editable === false) {
+            log.info(log._("server.palette-editor.disabled"));
+            installerEnabled = false;
+            return
+        }
+    } catch(err) {}
+
+    try {
+        if (settings.externalModules.palette.allowInstall === false) {
+            log.info(log._("server.palette-editor.disabled"));
+            installerEnabled = false;
+            return
+        }
+    } catch(err) {}
+
     if (settings.hasOwnProperty('editorTheme') &&
         settings.editorTheme.hasOwnProperty('palette') &&
         settings.editorTheme.palette.hasOwnProperty('editable') &&
         settings.editorTheme.palette.editable === false
     ) {
         log.info(log._("server.palette-editor.disabled"));
-        paletteEditorEnabled = false;
-        return Promise.resolve();
+        installerEnabled = false;
     } else {
         return new Promise(resolve => {
             child_process.execFile(npmCommand,['-v'],function(err,stdout) {
                 if (err) {
                     log.info(log._("server.palette-editor.npm-not-found"));
-                    paletteEditorEnabled = false;
+                    installerEnabled = false;
                 } else {
                     if (parseInt(stdout.split(".")[0]) < 3) {
                         log.info(log._("server.palette-editor.npm-too-old"));
-                        paletteEditorEnabled = false;
+                        installerEnabled = false;
                     } else {
-                        paletteEditorEnabled = true;
+                        installerEnabled = true;
                     }
                 }
                 resolve();
@@ -376,7 +496,7 @@ module.exports = {
     checkPrereq: checkPrereq,
     installModule: installModule,
     uninstallModule: uninstallModule,
-    paletteEditorEnabled: function() {
-        return paletteEditorEnabled
+    installerEnabled: function() {
+        return installerEnabled
     }
 }
diff --git a/packages/node_modules/@node-red/registry/lib/library.js b/packages/node_modules/@node-red/registry/lib/library.js
index a8ca8a775..b305456a5 100644
--- a/packages/node_modules/@node-red/registry/lib/library.js
+++ b/packages/node_modules/@node-red/registry/lib/library.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  **/
 
-var fs = require('fs');
+var fs = require('fs-extra');
 var fspath = require('path');
 
 var runtime;
@@ -22,12 +22,12 @@ var runtime;
 var exampleRoots = {};
 var exampleFlows = null;
 
-function getFlowsFromPath(path) {
-    return new Promise(function(resolve,reject) {
-        var result = {};
-        fs.readdir(path,function(err,files) {
-            var promises = [];
-            var validFiles = [];
+async function getFlowsFromPath(path) {
+    var result = {};
+    var validFiles = [];
+    return fs.readdir(path).then(files => {
+        var promises = [];
+        if (files) {
             files.forEach(function(file) {
                 var fullPath = fspath.join(path,file);
                 var stats = fs.lstatSync(fullPath);
@@ -39,21 +39,19 @@ function getFlowsFromPath(path) {
                     promises.push(Promise.resolve(file.split(".")[0]))
                 }
             })
-            var i=0;
-            Promise.all(promises).then(function(results) {
-                results.forEach(function(r) {
-                    if (typeof r === 'string') {
-                        result.f = result.f||[];
-                        result.f.push(r);
-                    } else {
-                        result.d = result.d||{};
-                        result.d[validFiles[i]] = r;
-                    }
-                    i++;
-                })
-                resolve(result);
-            })
-        });
+        }
+        return Promise.all(promises)
+    }).then(results => {
+        results.forEach(function(r,i) {
+            if (typeof r === 'string') {
+                result.f = result.f||[];
+                result.f.push(r);
+            } else {
+                result.d = result.d||{};
+                result.d[validFiles[i]] = r;
+            }
+        })
+        return result;
     })
 }
 
diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index 14e2a0b7e..bd5a7aae4 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var fs = require("fs-extra");
 var path = require("path");
 var semver = require("semver");
@@ -23,93 +22,154 @@ var localfilesystem = require("./localfilesystem");
 var registry = require("./registry");
 var registryUtil = require("./util")
 var i18n = require("@node-red/util").i18n;
+var log = require("@node-red/util").log;
 
 var settings;
-var runtime;
 
 function init(_runtime) {
-    runtime = _runtime;
-    settings = runtime.settings;
-    localfilesystem.init(runtime);
-    registryUtil.init(runtime);
+    settings = _runtime.settings;
+    localfilesystem.init(settings);
+    registryUtil.init(_runtime);
 }
 
 function load(disableNodePathScan) {
     // To skip node scan, the following line will use the stored node list.
     // We should expose that as an option at some point, although the
     // performance gains are minimal.
-    //return loadNodeFiles(registry.getModuleList());
-    runtime.log.info(runtime.log._("server.loading"));
+    //return loadModuleFiles(registry.getModuleList());
+    log.info(log._("server.loading"));
 
-    var nodeFiles = localfilesystem.getNodeFiles(disableNodePathScan);
-    return loadNodeFiles(nodeFiles);
+    var modules = localfilesystem.getNodeFiles(disableNodePathScan);
+    return loadModuleFiles(modules);
 }
 
-function loadNodeFiles(nodeFiles) {
+
+function loadModuleTypeFiles(module, type) {
+    const things = module[type];
+    var first = true;
     var promises = [];
-    var nodes = [];
-    for (var module in nodeFiles) {
+    for (var thingName in things) {
         /* istanbul ignore else */
-        if (nodeFiles.hasOwnProperty(module)) {
-            if (nodeFiles[module].redVersion &&
-                !semver.satisfies(runtime.version().replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), nodeFiles[module].redVersion)) {
+        if (things.hasOwnProperty(thingName)) {
+            if (module.name != "node-red" && first) {
+                // Check the module directory exists
+                first = false;
+                var fn = things[thingName].file;
+                var parts = fn.split("/");
+                var i = parts.length-1;
+                for (;i>=0;i--) {
+                    if (parts[i] == "node_modules") {
+                        break;
+                    }
+                }
+                var moduleFn = parts.slice(0,i+2).join("/");
+
+                try {
+                    var stat = fs.statSync(moduleFn);
+                } catch(err) {
+                    // Module not found, don't attempt to load its nodes
+                    break;
+                }
+            }
+
+            try {
+                var promise;
+                if (type === "nodes") {
+                    promise = loadNodeConfig(things[thingName]);
+                } else if (type === "plugins") {
+                    promise = loadPluginConfig(things[thingName]);
+                }
+                promises.push(
+                    promise.then(
+                        (function() {
+                            var m = module.name;
+                            var n = thingName;
+                            return function(nodeSet) {
+                                things[n] = nodeSet;
+                                return nodeSet;
+                            }
+                        })()
+                    ).catch(err => {console.log(err)})
+                );
+            } catch(err) {
+                console.log(err)
+                //
+            }
+        }
+    }
+    return promises;
+}
+
+function loadModuleFiles(modules) {
+    var pluginPromises = [];
+    var nodePromises = [];
+    for (var module in modules) {
+        /* istanbul ignore else */
+        if (modules.hasOwnProperty(module)) {
+            if (modules[module].redVersion &&
+                !semver.satisfies((settings.version||"0.0.0").replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), modules[module].redVersion)) {
                 //TODO: log it
-                runtime.log.warn("["+module+"] "+runtime.log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion}));
-                nodeFiles[module].err = "version_mismatch";
+                log.warn("["+module+"] "+log._("server.node-version-mismatch",{version:modules[module].redVersion}));
+                modules[module].err = "version_mismatch";
                 continue;
             }
             if (module == "node-red" || !registry.getModuleInfo(module)) {
-                var first = true;
-                for (var node in nodeFiles[module].nodes) {
-                    /* istanbul ignore else */
-                    if (nodeFiles[module].nodes.hasOwnProperty(node)) {
-                        if (module != "node-red" && first) {
-                            // Check the module directory exists
-                            first = false;
-                            var fn = nodeFiles[module].nodes[node].file;
-                            var parts = fn.split("/");
-                            var i = parts.length-1;
-                            for (;i>=0;i--) {
-                                if (parts[i] == "node_modules") {
-                                    break;
-                                }
-                            }
-                            var moduleFn = parts.slice(0,i+2).join("/");
-
-                            try {
-                                var stat = fs.statSync(moduleFn);
-                            } catch(err) {
-                                // Module not found, don't attempt to load its nodes
-                                break;
-                            }
-                        }
-
-                        try {
-                            promises.push(loadNodeConfig(nodeFiles[module].nodes[node]).then((function() {
-                                var m = module;
-                                var n = node;
-                                return function(nodeSet) {
-                                    nodeFiles[m].nodes[n] = nodeSet;
-                                    nodes.push(nodeSet);
-                                }
-                            })()));
-                        } catch(err) {
-                            //
-                        }
-                    }
+                if (modules[module].nodes) {
+                    nodePromises = nodePromises.concat(loadModuleTypeFiles(modules[module], "nodes"));
+                }
+                if (modules[module].plugins) {
+                    pluginPromises = pluginPromises.concat(loadModuleTypeFiles(modules[module], "plugins"));
                 }
             }
         }
     }
-    return when.settle(promises).then(function(results) {
-        for (var module in nodeFiles) {
-            if (nodeFiles.hasOwnProperty(module)) {
-                if (!nodeFiles[module].err) {
-                    registry.addModule(nodeFiles[module]);
+    var pluginList;
+    var nodeList;
+
+    return Promise.all(pluginPromises).then(function(results) {
+        pluginList = results.filter(r => !!r);
+        // Initial plugin load has happened. Ensure modules that provide
+        // plugins are in the registry now.
+        for (var module in modules) {
+            if (modules.hasOwnProperty(module)) {
+                if (modules[module].plugins && Object.keys(modules[module].plugins).length > 0) {
+                    // Add the modules for plugins
+                    if (!modules[module].err) {
+                        registry.addModule(modules[module]);
+                    }
                 }
             }
         }
-        return loadNodeSetList(nodes);
+        return loadNodeSetList(pluginList);
+    }).then(function() {
+        return Promise.all(nodePromises);
+    }).then(function(results) {
+        nodeList = results.filter(r => !!r);
+        // Initial node load has happened. Ensure remaining modules are in the registry
+        for (var module in modules) {
+            if (modules.hasOwnProperty(module)) {
+                if (!modules[module].plugins || Object.keys(modules[module].plugins).length === 0) {
+                    if (!modules[module].err) {
+                        registry.addModule(modules[module]);
+                    }
+                }
+            }
+        }
+        return loadNodeSetList(nodeList);
+    });
+}
+
+async function loadPluginTemplate(plugin) {
+    return fs.readFile(plugin.template,'utf8').then(content => {
+        plugin.config = content;
+        return plugin;
+    }).catch(err => {
+        if (err.code === 'ENOENT') {
+            plugin.err = "Error: "+plugin.template+" does not exist";
+        } else {
+            plugin.err = err.toString();
+        }
+        return plugin;
     });
 }
 
@@ -160,13 +220,10 @@ async function loadNodeTemplate(node) {
         }
         return node
     }).catch(err => {
-        node.types = [];
-        if (err.code === 'ENOENT') {
-            if (!node.types) {
-                node.types = [];
-            }
-            node.err = "Error: "+node.template+" does not exist";
-        } else {
+        // ENOENT means no html file. We can live with that. But any other error
+        // should be fatal
+        // node.err = "Error: "+node.template+" does not exist";
+        if (err.code !== 'ENOENT') {
             node.types = [];
             node.err = err.toString();
         }
@@ -180,11 +237,12 @@ async function loadNodeLocales(node) {
         node.namespace = node.module;
         return node
     }
-    return fs.stat(path.join(path.dirname(node.file),"locales")).then(stat => {
+    const baseFile = node.file||node.template;
+    return fs.stat(path.join(path.dirname(baseFile),"locales")).then(stat => {
         node.namespace = node.id;
         return i18n.registerMessageCatalog(node.id,
-                path.join(path.dirname(node.file),"locales"),
-                path.basename(node.file,".js")+".json")
+                path.join(path.dirname(baseFile),"locales"),
+                path.basename(baseFile).replace(/\.[^.]+$/,".json"))
             .then(() => node);
     }).catch(err => {
         node.namespace = node.module;
@@ -209,6 +267,7 @@ async function loadNodeConfig(fileInfo) {
     }
 
     var node = {
+        type: "node",
         id: id,
         module: module,
         name: name,
@@ -232,6 +291,58 @@ async function loadNodeConfig(fileInfo) {
     return node;
 }
 
+async function loadPluginConfig(fileInfo) {
+    var file = fileInfo.file;
+    var module = fileInfo.module;
+    var name = fileInfo.name;
+    var version = fileInfo.version;
+
+    var id = module + "/" + name;
+    var isEnabled = true;
+
+    // TODO: registry.getPluginInfo
+
+    // var info = registry.getPluginInfo(id);
+    // if (info) {
+    //     if (info.hasOwnProperty("loaded")) {
+    //         throw new Error(file+" already loaded");
+    //     }
+    //     isEnabled = info.enabled;
+    // }
+
+
+    if (!fs.existsSync(jsFile)) {
+    }
+
+    var plugin = {
+        type: "plugin",
+        id: id,
+        module: module,
+        name: name,
+        enabled: isEnabled,
+        loaded:false,
+        version: version,
+        local: fileInfo.local,
+        plugins: [],
+        config: "",
+        help: {}
+    };
+    var jsFile = file.replace(/\.[^.]+$/,".js");
+    var htmlFile = file.replace(/\.[^.]+$/,".html");
+    if (fs.existsSync(jsFile)) {
+        plugin.file = jsFile;
+    }
+    if (fs.existsSync(htmlFile)) {
+        plugin.template = htmlFile;
+    }
+    await loadNodeLocales(plugin)
+
+    if (plugin.template && !settings.disableEditor) {
+        return loadPluginTemplate(plugin);
+    }
+    return plugin
+}
+
 /**
  * Loads the specified node into the runtime
  * @param node a node info object - see loadNodeConfig
@@ -241,8 +352,6 @@ async function loadNodeConfig(fileInfo) {
  *
  */
 function loadNodeSet(node) {
-    var nodeDir = path.dirname(node.file);
-    var nodeFn = path.basename(node.file);
     if (!node.enabled) {
         return Promise.resolve(node);
     } else {
@@ -289,17 +398,65 @@ function loadNodeSet(node) {
     }
 }
 
+async function loadPlugin(plugin) {
+    if (!plugin.file) {
+        // No runtime component - nothing to load
+        return plugin;
+    }
+    try {
+        var r = require(plugin.file);
+        if (typeof r === "function") {
+
+            var red = registryUtil.createNodeApi(plugin);
+            var promise = r(red);
+            if (promise != null && typeof promise.then === "function") {
+                return promise.then(function() {
+                    plugin.enabled = true;
+                    plugin.loaded = true;
+                    return plugin;
+                }).catch(function(err) {
+                    plugin.err = err;
+                    return plugin;
+                });
+            }
+        }
+        plugin.enabled = true;
+        plugin.loaded = true;
+        return plugin;
+    } catch(err) {
+        console.log(err);
+        plugin.err = err;
+        var stack = err.stack;
+        var message;
+        if (stack) {
+            var i = stack.indexOf(plugin.file);
+            if (i > -1) {
+                var excerpt = stack.substring(i+node.file.length+1,i+plugin.file.length+20);
+                var m = /^(\d+):(\d+)/.exec(excerpt);
+                if (m) {
+                    plugin.err = err+" (line:"+m[1]+")";
+                }
+            }
+        }
+        return plugin;
+    }
+}
+
 function loadNodeSetList(nodes) {
     var promises = [];
     nodes.forEach(function(node) {
         if (!node.err) {
-            promises.push(loadNodeSet(node));
+            if (node.type === "plugin") {
+                promises.push(loadPlugin(node).catch(err => {}));
+            } else {
+                promises.push(loadNodeSet(node).catch(err => {}));
+            }
         } else {
             promises.push(node);
         }
     });
 
-    return when.settle(promises).then(function() {
+    return Promise.all(promises).then(function() {
         if (settings.available()) {
             return registry.saveNodeList();
         } else {
@@ -313,15 +470,37 @@ function addModule(module) {
         throw new Error("Settings unavailable");
     }
     var nodes = [];
-    if (registry.getModuleInfo(module)) {
+    var existingInfo = registry.getModuleInfo(module);
+    if (existingInfo) {
         // TODO: nls
         var e = new Error("module_already_loaded");
         e.code = "module_already_loaded";
         return Promise.reject(e);
     }
     try {
-        var moduleFiles = localfilesystem.getModuleFiles(module);
-        return loadNodeFiles(moduleFiles);
+        var moduleFiles = {};
+        var moduleStack = [module];
+        while(moduleStack.length > 0) {
+            var moduleToLoad = moduleStack.shift();
+            var files = localfilesystem.getModuleFiles(moduleToLoad);
+            if (files[moduleToLoad]) {
+                moduleFiles[moduleToLoad] = files[moduleToLoad];
+                if (moduleFiles[moduleToLoad].dependencies) {
+                    log.debug(`Loading dependencies for ${module}`)
+                    for (var i=0; i<moduleFiles[moduleToLoad].dependencies.length; i++) {
+                        var dep = moduleFiles[moduleToLoad].dependencies[i]
+                        if (!registry.getModuleInfo(dep)) {
+                            log.debug(` - load ${dep}`)
+                            moduleStack.push(dep);
+                        } else {
+                            log.debug(` - already loaded ${dep}`)
+                            registry.addModuleDependency(dep,moduleToLoad)
+                        }
+                    }
+                }
+            }
+        }
+        return loadModuleFiles(moduleFiles).then(() => module)
     } catch(err) {
         return Promise.reject(err);
     }
diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
index 7233d1da3..d07d104ec 100644
--- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js
+++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
@@ -14,22 +14,34 @@
  * limitations under the License.
  **/
 
-var fs = require("fs");
-var path = require("path");
+const fs = require("fs");
+const path = require("path");
+const log = require("@node-red/util").log;
+const i18n = require("@node-red/util").i18n;
+const registryUtil = require("./util");
 
-var events;
-var log;
+// Default allow/deny lists
+let loadAllowList = ['*'];
+let loadDenyList = [];
 
-var log = require("@node-red/util").log;
-var i18n = require("@node-red/util").i18n;
 
 var settings;
 var disableNodePathScan = false;
 var iconFileExtensions = [".png", ".gif", ".svg"];
+var packageList = {};
 
-function init(runtime) {
-    settings = runtime.settings;
-    events = runtime.events;
+function init(_settings) {
+    settings = _settings;
+    // TODO: This is duplicated in installer.js
+    //       Should it *all* be managed by util?
+    if (settings.externalModules && settings.externalModules.palette) {
+        if (settings.externalModules.palette.allowList || settings.externalModules.palette.denyList) {
+            loadAllowList = settings.externalModules.palette.allowList;
+            loadDenyList = settings.externalModules.palette.denyList;
+        }
+    }
+    loadAllowList = registryUtil.parseModuleList(loadAllowList);
+    loadDenyList = registryUtil.parseModuleList(loadDenyList);
 }
 
 function isIncluded(name) {
@@ -75,7 +87,6 @@ function getLocalFile(file) {
 
 /**
  * Synchronously walks the directory looking for node files.
- * Emits 'node-icon-dir' events for an icon dirs found
  * @param dir the directory to search
  * @return an array of fully-qualified paths to .js files
  */
@@ -143,8 +154,12 @@ function scanDirForNodesModules(dir,moduleName) {
                     try {
                         var pkg = require(pkgfn);
                         if (pkg['node-red']) {
-                            var moduleDir = path.join(dir,fn);
-                            results.push({dir:moduleDir,package:pkg});
+                            if (!registryUtil.checkModuleAllowed(pkg.name,pkg.version,loadAllowList,loadDenyList)) {
+                                log.debug("! Module: "+pkg.name+" "+pkg.version+ " *ignored due to denyList*");
+                            } else {
+                                var moduleDir = path.join(dir,fn);
+                                results.push({dir:moduleDir,package:pkg});
+                            }
                         }
                     } catch(err) {
                         if (err.code != "MODULE_NOT_FOUND") {
@@ -173,9 +188,17 @@ function scanTreeForNodesModules(moduleName) {
     var userDir;
 
     if (settings.userDir) {
+        packageList = getPackageList();
         userDir = path.join(settings.userDir,"node_modules");
         results = scanDirForNodesModules(userDir,moduleName);
-        results.forEach(function(r) { r.local = true; });
+        results.forEach(function(r) {
+            // If it was found in <userDir>/node_modules then it is considered
+            // a local module.
+            // Also check to see if it is listed in the package.json file as a user-installed
+            // module. This distinguishes modules installed as a dependency
+            r.local = true;
+            r.user = !!packageList[r.package.name];
+        });
     }
 
     if (dir) {
@@ -197,39 +220,46 @@ function getModuleNodeFiles(module) {
     var moduleDir = module.dir;
     var pkg = module.package;
 
-    var nodes = pkg['node-red'].nodes||{};
-    var results = [];
     var iconDirs = [];
     var iconList = [];
-    for (var n in nodes) {
-        /* istanbul ignore else */
-        if (nodes.hasOwnProperty(n)) {
-            var file = path.join(moduleDir,nodes[n]);
-            results.push({
-                file:    file,
-                module:  pkg.name,
-                name:    n,
-                version: pkg.version
-            });
-            var iconDir = path.join(moduleDir,path.dirname(nodes[n]),"icons");
-            if (iconDirs.indexOf(iconDir) == -1) {
-                try {
-                    fs.statSync(iconDir);
-                    var icons = scanIconDir(iconDir);
-                    iconList.push({path:iconDir,icons:icons});
-                    iconDirs.push(iconDir);
-                } catch(err) {
+
+    function scanTypes(types) {
+        const files = [];
+        for (var n in types) {
+            /* istanbul ignore else */
+            if (types.hasOwnProperty(n)) {
+                var file = path.join(moduleDir,types[n]);
+                files.push({
+                    file:    file,
+                    module:  pkg.name,
+                    name:    n,
+                    version: pkg.version
+                });
+                var iconDir = path.join(moduleDir,path.dirname(types[n]),"icons");
+                if (iconDirs.indexOf(iconDir) == -1) {
+                    try {
+                        fs.statSync(iconDir);
+                        var icons = scanIconDir(iconDir);
+                        iconList.push({path:iconDir,icons:icons});
+                        iconDirs.push(iconDir);
+                    } catch(err) {
+                    }
                 }
             }
         }
+        return files;
     }
-    var result = {files:results,icons:iconList};
+
+    var result = {
+        nodeFiles:scanTypes(pkg['node-red'].nodes||{}),
+        pluginFiles:scanTypes(pkg['node-red'].plugins||{}),
+        icons:iconList
+    };
 
     var examplesDir = path.join(moduleDir,"examples");
     try {
         fs.statSync(examplesDir)
         result.examples = {path:examplesDir};
-        // events.emit("node-examples-dir",{name:pkg.name,path:examplesDir});
     } catch(err) {
     }
     return result;
@@ -275,20 +305,21 @@ function getNodeFiles(disableNodePathScan) {
         }
     }
 
-    var nodeList = {
-        "node-red": {
-            name: "node-red",
-            version: settings.version,
-            nodes: {},
-            icons: iconList
-        }
+    var coreNodeEntry = {
+        name: "node-red",
+        version: settings.version,
+        nodes: {},
+        icons: iconList
     }
+    var nodeList = {
+        "node-red": coreNodeEntry
+    };
     nodeFiles.forEach(function(node) {
-        nodeList["node-red"].nodes[node.name] = node;
+        coreNodeEntry.nodes[node.name] = node;
     });
     if (settings.coreNodesDir) {
         var examplesDir = path.join(settings.coreNodesDir,"examples");
-        nodeList["node-red"].examples = {path: examplesDir};
+        coreNodeEntry.examples = {path: examplesDir};
     }
 
     if (!disableNodePathScan) {
@@ -297,7 +328,6 @@ function getNodeFiles(disableNodePathScan) {
         // Filter the module list to ignore global modules
         // that have also been installed locally - allowing the user to
         // update a module they may not otherwise be able to touch
-
         moduleFiles.sort(function(A,B) {
             if (A.local && !B.local) {
                 return -1
@@ -310,36 +340,39 @@ function getNodeFiles(disableNodePathScan) {
         moduleFiles = moduleFiles.filter(function(mod) {
             var result;
             if (!knownModules[mod.package.name]) {
-                knownModules[mod.package.name] = true;
+                knownModules[mod.package.name] = mod;
                 result = true;
             } else {
                 result = false;
             }
-            log.debug("Module: "+mod.package.name+" "+mod.package.version+(result?"":" *ignored due to local copy*"));
-            log.debug("        "+mod.dir);
+            log.debug((result?"":"! ")+"Module: "+mod.package.name+" "+mod.package.version+" "+mod.dir+(result?"":" *ignored due to local copy*"));
             return result;
         });
 
-        moduleFiles.forEach(function(moduleFile) {
-            var nodeModuleFiles = getModuleNodeFiles(moduleFile);
-            nodeList[moduleFile.package.name] = {
-                name: moduleFile.package.name,
-                version: moduleFile.package.version,
-                path: moduleFile.dir,
-                local: moduleFile.local||false,
-                nodes: {},
-                icons: nodeModuleFiles.icons,
-                examples: nodeModuleFiles.examples
-            };
-            if (moduleFile.package['node-red'].version) {
-                nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version;
+        // Do a second pass to check we have all the declared node dependencies
+        // As this is only done as part of the initial palette load, `knownModules` will
+        // contain a list of everything discovered during this phase. This means
+        // we can check for missing dependencies here.
+        moduleFiles = moduleFiles.filter(function(mod) {
+            if (Array.isArray(mod.package["node-red"].dependencies)) {
+                const deps = mod.package["node-red"].dependencies;
+                const missingDeps = mod.package["node-red"].dependencies.filter(dep => {
+                    if (knownModules[dep]) {
+                        knownModules[dep].usedBy = knownModules[dep].usedBy || [];
+                        knownModules[dep].usedBy.push(mod.package.name)
+                    } else {
+                        return true;
+                    }
+                })
+                if (missingDeps.length > 0) {
+                    log.error(`Module: ${mod.package.name} missing dependencies:`);
+                    missingDeps.forEach(m => { log.error(` - ${m}`)});
+                    return false;
+                }
             }
-            nodeModuleFiles.files.forEach(function(node) {
-                node.local = moduleFile.local||false;
-                nodeList[moduleFile.package.name].nodes[node.name] = node;
-            });
-            nodeFiles = nodeFiles.concat(nodeModuleFiles.files);
+            return true;
         });
+        nodeList = convertModuleFileListToObject(moduleFiles, nodeList);
     } else {
         // console.log("node path scan disabled");
     }
@@ -347,32 +380,52 @@ function getNodeFiles(disableNodePathScan) {
 }
 
 function getModuleFiles(module) {
-    var nodeList = {};
-
+    // Update the package list
     var moduleFiles = scanTreeForNodesModules(module);
     if (moduleFiles.length === 0) {
         var err = new Error(log._("nodes.registry.localfilesystem.module-not-found", {module:module}));
         err.code = 'MODULE_NOT_FOUND';
         throw err;
     }
+    // Unlike when doing the initial palette load, this call cannot verify the
+    // dependencies of the new module as it doesn't have visiblity of what
+    // is in the registry. That will have to be done be the caller in loader.js
+    return convertModuleFileListToObject(moduleFiles);
+}
 
+function convertModuleFileListToObject(moduleFiles,seedObject) {
+    const nodeList = seedObject || {};
     moduleFiles.forEach(function(moduleFile) {
+
         var nodeModuleFiles = getModuleNodeFiles(moduleFile);
         nodeList[moduleFile.package.name] = {
             name: moduleFile.package.name,
             version: moduleFile.package.version,
             path: moduleFile.dir,
+            local: moduleFile.local||false,
+            user: moduleFile.user||false,
             nodes: {},
+            plugins: {},
             icons: nodeModuleFiles.icons,
             examples: nodeModuleFiles.examples
         };
         if (moduleFile.package['node-red'].version) {
             nodeList[moduleFile.package.name].redVersion = moduleFile.package['node-red'].version;
         }
-        nodeModuleFiles.files.forEach(function(node) {
+        if (moduleFile.package['node-red'].dependencies) {
+            nodeList[moduleFile.package.name].dependencies = moduleFile.package['node-red'].dependencies;
+        }
+        if (moduleFile.usedBy) {
+            nodeList[moduleFile.package.name].usedBy = moduleFile.usedBy;
+        }
+        nodeModuleFiles.nodeFiles.forEach(function(node) {
             nodeList[moduleFile.package.name].nodes[node.name] = node;
             nodeList[moduleFile.package.name].nodes[node.name].local = moduleFile.local || false;
         });
+        nodeModuleFiles.pluginFiles.forEach(function(plugin) {
+            nodeList[moduleFile.package.name].plugins[plugin.name] = plugin;
+            nodeList[moduleFile.package.name].plugins[plugin.name].local = moduleFile.local || false;
+        });
     });
     return nodeList;
 }
@@ -400,6 +453,23 @@ function scanIconDir(dir) {
     })
     return iconList;
 }
+/**
+ * Gets the list of modules installed in this runtime as reported by package.json
+ * Note: these may include non-Node-RED modules
+ */
+function getPackageList() {
+    var list = {};
+    if (settings.userDir) {
+        try {
+            var userPackage = path.join(settings.userDir,"package.json");
+            var pkg = JSON.parse(fs.readFileSync(userPackage,"utf-8"));
+            return pkg.dependencies;
+        } catch(err) {
+            log.error(err);
+        }
+    }
+    return list;
+}
 
 module.exports = {
     init: init,
diff --git a/packages/node_modules/@node-red/registry/lib/plugins.js b/packages/node_modules/@node-red/registry/lib/plugins.js
new file mode 100644
index 000000000..82b230011
--- /dev/null
+++ b/packages/node_modules/@node-red/registry/lib/plugins.js
@@ -0,0 +1,103 @@
+const registry = require("./registry");
+const {events} = require("@node-red/util")
+
+var pluginConfigCache = {};
+var pluginToId = {};
+var plugins = {};
+var pluginsByType = {};
+var settings;
+
+function init(_settings) {
+    settings = _settings;
+    plugins = {};
+    pluginConfigCache = {};
+    pluginToId = {};
+    pluginsByType = {};
+}
+
+function registerPlugin(nodeSetId,id,definition) {
+    var moduleId = registry.getModuleFromSetId(nodeSetId);
+    var pluginId = registry.getNodeFromSetId(nodeSetId);
+
+    definition.id = id;
+    definition.module = moduleId;
+    pluginToId[id] = nodeSetId;
+    plugins[id] = definition;
+    var module = registry.getModule(moduleId);
+
+    definition.path = module.path;
+
+    module.plugins[pluginId].plugins.push(definition);
+    if (definition.type) {
+        pluginsByType[definition.type] = pluginsByType[definition.type] || [];
+        pluginsByType[definition.type].push(definition);
+    }
+    if (definition.onadd && typeof definition.onadd === 'function') {
+        definition.onadd();
+    }
+    events.emit("registry:plugin-added",id);
+}
+
+function getPlugin(id) {
+    return plugins[id]
+}
+
+function getPluginsByType(type) {
+    return pluginsByType[type] || [];
+}
+
+function getPluginConfigs(lang) {
+    if (!pluginConfigCache[lang]) {
+        var result = "";
+        var script = "";
+        var moduleConfigs = registry.getModuleList();
+        for (var module in moduleConfigs) {
+            /* istanbul ignore else */
+            if (moduleConfigs.hasOwnProperty(module)) {
+                var plugins = moduleConfigs[module].plugins;
+                for (var plugin in plugins) {
+                    if (plugins.hasOwnProperty(plugin)) {
+                        var config = plugins[plugin];
+                        if (config.enabled && !config.err && config.config) {
+                            result += "\n<!-- --- [red-plugin:"+config.id+"] --- -->\n";
+                            result += config.config;
+                        }
+                    }
+                }
+            }
+        }
+        pluginConfigCache[lang] = result;
+    }
+    return pluginConfigCache[lang];
+}
+function getPluginList() {
+    var list = [];
+    var moduleConfigs = registry.getModuleList();
+    for (var module in moduleConfigs) {
+        /* istanbul ignore else */
+        if (moduleConfigs.hasOwnProperty(module)) {
+            var plugins = moduleConfigs[module].plugins;
+            for (var plugin in plugins) {
+                /* istanbul ignore else */
+                if (plugins.hasOwnProperty(plugin)) {
+                    var pluginInfo = registry.filterNodeInfo(plugins[plugin]);
+                    pluginInfo.version = moduleConfigs[module].version;
+                    // if (moduleConfigs[module].pending_version) {
+                    //     nodeInfo.pending_version = moduleConfigs[module].pending_version;
+                    // }
+                    list.push(pluginInfo);
+                }
+            }
+        }
+    }
+    return list;
+}
+
+module.exports = {
+    init,
+    registerPlugin,
+    getPlugin,
+    getPluginsByType,
+    getPluginConfigs,
+    getPluginList
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/registry/lib/registry.js b/packages/node_modules/@node-red/registry/lib/registry.js
index 89f04eacc..96594fbef 100644
--- a/packages/node_modules/@node-red/registry/lib/registry.js
+++ b/packages/node_modules/@node-red/registry/lib/registry.js
@@ -19,8 +19,8 @@ var path = require("path");
 var fs = require("fs");
 
 var library = require("./library");
-
-var events;
+const {events} = require("@node-red/util")
+var subflows = require("./subflow");
 var settings;
 var loader;
 
@@ -28,16 +28,18 @@ var nodeConfigCache = {};
 var moduleConfigs = {};
 var nodeList = [];
 var nodeConstructors = {};
+var subflowModules = {};
+
 var nodeTypeToId = {};
 var moduleNodes = {};
 
-function init(_settings,_loader, _events) {
+function init(_settings,_loader) {
     settings = _settings;
     loader = _loader;
-    events = _events;
     moduleNodes = {};
     nodeTypeToId = {};
     nodeConstructors = {};
+    subflowModules = {};
     nodeList = [];
     nodeConfigCache = {};
 }
@@ -56,7 +58,8 @@ function filterNodeInfo(n) {
         name: n.name,
         types: n.types,
         enabled: n.enabled,
-        local: n.local||false
+        local: n.local||false,
+        user: n.user || false
     };
     if (n.hasOwnProperty("module")) {
         r.module = n.module;
@@ -64,17 +67,24 @@ function filterNodeInfo(n) {
     if (n.hasOwnProperty("err")) {
         r.err = n.err;
     }
+    if (n.hasOwnProperty("plugins")) {
+        r.plugins = n.plugins;
+    }
+    if (n.type === "plugin") {
+        r.editor = !!n.template;
+        r.runtime = !!n.file;
+    }
     return r;
 }
 
 
 
-function getModule(id) {
+function getModuleFromSetId(id) {
     var parts = id.split("/");
     return parts.slice(0,parts.length-1).join("/");
 }
 
-function getNode(id) {
+function getNodeFromSetId(id) {
     var parts = id.split("/");
     return parts[parts.length-1];
 }
@@ -92,6 +102,7 @@ function saveNodeList() {
                         name: module,
                         version: moduleConfigs[module].version,
                         local: moduleConfigs[module].local||false,
+                        user: moduleConfigs[module].user||false,
                         nodes: {}
                     };
                     if (moduleConfigs[module].hasOwnProperty('pending_version')) {
@@ -177,6 +188,7 @@ function loadNodeConfigs() {
 function addModule(module) {
     moduleNodes[module.name] = [];
     moduleConfigs[module.name] = module;
+    // console.log("registry.js.addModule",module.name,"user?",module.user,"usedBy",module.usedBy,"dependencies",module.dependencies)
     for (var setName in module.nodes) {
         if (module.nodes.hasOwnProperty(setName)) {
             var set = module.nodes[setName];
@@ -215,11 +227,11 @@ function addModule(module) {
 
 
 function removeNode(id) {
-    var config = moduleConfigs[getModule(id)].nodes[getNode(id)];
+    var config = moduleConfigs[getModuleFromSetId(id)].nodes[getNodeFromSetId(id)];
     if (!config) {
         throw new Error("Unrecognised id: "+id);
     }
-    delete moduleConfigs[getModule(id)].nodes[getNode(id)];
+    delete moduleConfigs[getModuleFromSetId(id)].nodes[getNodeFromSetId(id)];
     var i = nodeList.indexOf(id);
     if (i > -1) {
         nodeList.splice(i,1);
@@ -227,6 +239,7 @@ function removeNode(id) {
     config.types.forEach(function(t) {
         var typeId = nodeTypeToId[t];
         if (typeId === id) {
+            delete subflowModules[t];
             delete nodeConstructors[t];
             delete nodeTypeToId[t];
         }
@@ -237,21 +250,47 @@ function removeNode(id) {
     return filterNodeInfo(config);
 }
 
-function removeModule(module) {
+function removeModule(name,skipSave) {
     if (!settings.available()) {
         throw new Error("Settings unavailable");
     }
-    var nodes = moduleNodes[module];
-    if (!nodes) {
-        throw new Error("Unrecognised module: "+module);
-    }
     var infoList = [];
-    for (var i=0;i<nodes.length;i++) {
-        infoList.push(removeNode(module+"/"+nodes[i]));
+    var module = moduleConfigs[name];
+    var nodes = moduleNodes[name];
+    if (!nodes) {
+        throw new Error("Unrecognised module: "+name);
+    }
+    if (module.usedBy && module.usedBy > 0) {
+        // We are removing a module that is used by other modules... so whilst
+        // this module should be removed from the editor palette, it needs to
+        // stay in the runtime... for now.
+        module.user = false;
+        for (var i=0;i<nodes.length;i++) {
+            infoList.push(filterNodeInfo(nodes[i]));
+        }
+    } else {
+        if (module.dependencies) {
+            module.dependencies.forEach(function(dep) {
+                // Check each dependency of this module to see if it is a non-user-installed
+                // module that we can expect to disappear once npm uninstall is run
+                if (!moduleConfigs[dep].user) {
+                    moduleConfigs[dep].usedBy = moduleConfigs[dep].usedBy.filter(m => m !== name);
+                    if (moduleConfigs[dep].usedBy.length === 0) {
+                        // Remove the dependency
+                        removeModule(dep,true);
+                    }
+                }
+            });
+        }
+        for (var i=0;i<nodes.length;i++) {
+            infoList.push(removeNode(name+"/"+nodes[i]));
+        }
+        delete moduleNodes[name];
+        delete moduleConfigs[name];
+    }
+    if (!skipSave) {
+        saveNodeList();
     }
-    delete moduleNodes[module];
-    delete moduleConfigs[module];
-    saveNodeList();
     return infoList;
 }
 
@@ -262,9 +301,9 @@ function getNodeInfo(typeOrId) {
     }
     /* istanbul ignore else */
     if (id) {
-        var module = moduleConfigs[getModule(id)];
+        var module = moduleConfigs[getModuleFromSetId(id)];
         if (module) {
-            var config = module.nodes[getNode(id)];
+            var config = module.nodes[getNodeFromSetId(id)];
             if (config) {
                 var info = filterNodeInfo(config);
                 if (config.hasOwnProperty("loaded")) {
@@ -291,9 +330,9 @@ function getFullNodeInfo(typeOrId) {
     }
     /* istanbul ignore else */
     if (id) {
-        var module = moduleConfigs[getModule(id)];
+        var module = moduleConfigs[getModuleFromSetId(id)];
         if (module) {
-            return module.nodes[getNode(id)];
+            return module.nodes[getNodeFromSetId(id)];
         }
     }
     return null;
@@ -304,6 +343,9 @@ function getNodeList(filter) {
     for (var module in moduleConfigs) {
         /* istanbul ignore else */
         if (moduleConfigs.hasOwnProperty(module)) {
+            if (!moduleConfigs[module].user && (moduleConfigs[module].usedBy && moduleConfigs[module].usedBy.length > 0)) {
+                continue;
+            }
             var nodes = moduleConfigs[module].nodes;
             for (var node in nodes) {
                 /* istanbul ignore else */
@@ -324,16 +366,10 @@ function getNodeList(filter) {
 }
 
 function getModuleList() {
-    //var list = [];
-    //for (var module in moduleNodes) {
-    //    /* istanbul ignore else */
-    //    if (moduleNodes.hasOwnProperty(module)) {
-    //        list.push(registry.getModuleInfo(module));
-    //    }
-    //}
-    //return list;
     return moduleConfigs;
-
+}
+function getModule(id) {
+    return moduleConfigs[id];
 }
 
 function getModuleInfo(module) {
@@ -343,9 +379,13 @@ function getModuleInfo(module) {
             name: module,
             version: moduleConfigs[module].version,
             local: moduleConfigs[module].local,
+            user: moduleConfigs[module].user,
             path: moduleConfigs[module].path,
             nodes: []
         };
+        if (moduleConfigs[module].dependencies) {
+            m.dependencies = moduleConfigs[module].dependencies;
+        }
         if (moduleConfigs[module] && moduleConfigs[module].pending_version) {
             m.pending_version = moduleConfigs[module].pending_version;
         }
@@ -395,13 +435,38 @@ function registerNodeConstructor(nodeSet,type,constructor) {
     events.emit("type-registered",type);
 }
 
+function registerSubflow(nodeSet, subflow) {
+    var nodeSetInfo = getFullNodeInfo(nodeSet);
+
+    const result = subflows.register(nodeSet,subflow);
+
+    if (subflowModules.hasOwnProperty(result.type)) {
+        throw new Error(result.type+" already registered");
+    }
+
+    if (nodeSetInfo) {
+        if (nodeSetInfo.types.indexOf(result.type) === -1) {
+            nodeSetInfo.types.push(result.type);
+            nodeTypeToId[result.type] = nodeSetInfo.id;
+        }
+        nodeSetInfo.config = result.config;
+    }
+    subflowModules[result.type] = result;
+    events.emit("type-registered",result.type);
+    return result;
+}
+
 function getAllNodeConfigs(lang) {
     if (!nodeConfigCache[lang]) {
         var result = "";
         var script = "";
         for (var i=0;i<nodeList.length;i++) {
             var id = nodeList[i];
-            var config = moduleConfigs[getModule(id)].nodes[getNode(id)];
+            var module = moduleConfigs[getModuleFromSetId(id)]
+            if (!module.user && (module.usedBy && module.usedBy.length > 0)) {
+                continue;
+            }
+            var config = module.nodes[getNodeFromSetId(id)];
             if (config.enabled && !config.err) {
                 result += "\n<!-- --- [red-module:"+id+"] --- -->\n";
                 result += config.config;
@@ -420,11 +485,11 @@ function getAllNodeConfigs(lang) {
 }
 
 function getNodeConfig(id,lang) {
-    var config = moduleConfigs[getModule(id)];
+    var config = moduleConfigs[getModuleFromSetId(id)];
     if (!config) {
         return null;
     }
-    config = config.nodes[getNode(id)];
+    config = config.nodes[getNodeFromSetId(id)];
     if (config) {
         var result = "<!-- --- [red-module:"+id+"] --- -->\n"+config.config;
         result += loader.getNodeHelp(config,lang||"en-US")
@@ -445,11 +510,11 @@ function getNodeConstructor(type) {
     if (typeof id === "undefined") {
         config = undefined;
     } else {
-        config = moduleConfigs[getModule(id)].nodes[getNode(id)];
+        config = moduleConfigs[getModuleFromSetId(id)].nodes[getNodeFromSetId(id)];
     }
 
     if (!config || (config.enabled && !config.err)) {
-        return nodeConstructors[type];
+        return nodeConstructors[type] || subflowModules[type];
     }
     return null;
 }
@@ -459,6 +524,7 @@ function clear() {
     moduleConfigs = {};
     nodeList = [];
     nodeConstructors = {};
+    subflowModules = {};
     nodeTypeToId = {};
 }
 
@@ -481,7 +547,7 @@ function enableNodeSet(typeOrId) {
     }
     var config;
     try {
-        config = moduleConfigs[getModule(id)].nodes[getNode(id)];
+        config = moduleConfigs[getModuleFromSetId(id)].nodes[getNodeFromSetId(id)];
         delete config.err;
         config.enabled = true;
         nodeConfigCache = {};
@@ -504,7 +570,7 @@ function disableNodeSet(typeOrId) {
     }
     var config;
     try {
-        config = moduleConfigs[getModule(id)].nodes[getNode(id)];
+        config = moduleConfigs[getModuleFromSetId(id)].nodes[getNodeFromSetId(id)];
         // TODO: persist setting
         config.enabled = false;
         nodeConfigCache = {};
@@ -562,6 +628,17 @@ function setModulePendingUpdated(module,version) {
     });
 }
 
+function setUserInstalled(module,userInstalled) {
+    moduleConfigs[module].user = userInstalled;
+    return saveNodeList().then(function() {
+        return getModuleInfo(module);
+    });
+}
+function addModuleDependency(module,usedBy) {
+    moduleConfigs[module].usedBy = moduleConfigs[module].usedBy || [];
+    moduleConfigs[module].usedBy.push(usedBy);
+}
+
 var icon_paths = { };
 var iconCache = {};
 
@@ -615,6 +692,7 @@ var registry = module.exports = {
     registerNodeConstructor: registerNodeConstructor,
     getNodeConstructor: getNodeConstructor,
 
+    registerSubflow: registerSubflow,
 
     addModule: addModule,
 
@@ -622,12 +700,16 @@ var registry = module.exports = {
     disableNodeSet: disableNodeSet,
 
     setModulePendingUpdated: setModulePendingUpdated,
+    setUserInstalled: setUserInstalled,
+    addModuleDependency:addModuleDependency,
+
     removeModule: removeModule,
 
     getNodeInfo: getNodeInfo,
     getFullNodeInfo: getFullNodeInfo,
     getNodeList: getNodeList,
     getModuleList: getModuleList,
+    getModule: getModule,
     getModuleInfo: getModuleInfo,
 
     getNodeIconPath: getNodeIconPath,
@@ -643,5 +725,8 @@ var registry = module.exports = {
 
     saveNodeList: saveNodeList,
 
-    cleanModuleList: cleanModuleList
+    cleanModuleList: cleanModuleList,
+    getModuleFromSetId: getModuleFromSetId,
+    getNodeFromSetId: getNodeFromSetId,
+    filterNodeInfo: filterNodeInfo
 };
diff --git a/packages/node_modules/@node-red/registry/lib/subflow.js b/packages/node_modules/@node-red/registry/lib/subflow.js
new file mode 100644
index 000000000..97516691e
--- /dev/null
+++ b/packages/node_modules/@node-red/registry/lib/subflow.js
@@ -0,0 +1,127 @@
+function getSubflowType(subflow) {
+    if (subflow.meta && subflow.meta.type) {
+        return subflow.meta.type
+    }
+    return "sf:"+subflow.id
+}
+
+function generateSubflowConfig(subflow) {
+
+    const subflowType = getSubflowType(subflow)
+    const label = subflow.name || subflowType;
+    const category = subflow.category || "function";
+    const color = subflow.color || "#C0DEED";
+    const inputCount = subflow.in?subflow.in.length:0;
+    const outputCount = subflow.out?subflow.out.length:0;
+    const icon = subflow.icon || "arrow-in.svg";
+
+    const defaults = {
+        name: {value: ""}
+    }
+
+    const credentials = {}
+
+    if (subflow.env) {
+        subflow.env.forEach(prop => {
+            var defaultValue;
+
+            switch(prop.type) {
+                case "cred": defaultValue = ""; break;
+                case "str": defaultValue = prop.value||""; break;
+                case "bool": defaultValue = (typeof prop.value === 'boolean')?prop.value:prop.value === "true" ; break;
+                case "num": defaultValue = (typeof prop.value === 'number')?prop.value:Number(prop.value); break;
+                default:
+                    defaultValue = {
+                        type: prop.type,
+                        value: prop.value||""
+                    }
+            }
+
+
+
+            defaults[prop.name] = {
+                value: defaultValue,
+                ui: prop.ui
+            }
+            if (prop.type === 'cred') {
+                defaults[prop.name].ui.type = "cred";
+                credentials[prop.name] = {type:"password"}
+            }
+        })
+    }
+    const defaultString = JSON.stringify(defaults);
+    const credentialsString = JSON.stringify(credentials);
+
+    let nodeHelp = "";
+    if (subflow.info) {
+        nodeHelp = `<script type="text/markdown" data-help-name="${subflowType}">${subflow.info}</script>`
+    }
+
+    return `<script type="text/javascript">
+    RED.nodes.registerType("${subflowType}",{
+        subflowModule: true,
+        category: "${category}",
+        color: "${color}",
+        defaults: ${defaultString},
+        credentials: ${credentialsString},
+        inputs:${inputCount},
+        outputs:${outputCount},
+        icon: "${icon}",
+        paletteLabel: "${label}",
+        label: function() {
+            return this.name||"${label}";
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: function() {
+            RED.subflow.buildEditForm('subflow', this);
+        },
+        oneditsave: function() {
+            var props = RED.subflow.exportSubflowInstanceEnv(this);
+            var i=0,l=props.length;
+            for (;i<l;i++) {
+                var prop = props[i];
+                if (this._def.defaults[prop.name].ui && this._def.defaults[prop.name].ui.type === "cred") {
+                    this[prop.name] = "";
+                    this.credentials[prop.name] = prop.value || "";
+                    this.credentials['has_' + prop.name] = (this.credentials[prop.name] !== "");
+                } else {
+                    switch(prop.type) {
+                        case "str": this[prop.name] = prop.value||""; break;
+                        case "bool": this[prop.name] = (typeof prop.value === 'boolean')?prop.value:prop.value === "true" ; break;
+                        case "num": this[prop.name] = (typeof prop.value === 'number')?prop.value:Number(prop.value); break;
+                        default:
+                            this[prop.name] = {
+                                type: prop.type,
+                                value: prop.value||""
+                            }
+                    }
+                }
+            }
+        }
+    });
+</script>
+<script type="text/x-red" data-template-name="${subflowType}">
+    <div class="form-row">
+        <label for="node-input-name" data-i18n="[append]editor:common.label.name"><i class="fa fa-tag"></i> </label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]editor:common.label.name">
+    </div>
+    <div id="subflow-input-ui"></div>
+</script>
+${nodeHelp}
+`
+}
+
+
+function register(id,subflow) {
+    return {
+        subflow: subflow,
+        type: getSubflowType(subflow),
+        config: generateSubflowConfig(subflow)
+    }
+}
+
+module.exports = {
+    register: register
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/registry/lib/util.js b/packages/node_modules/@node-red/registry/lib/util.js
index 5a6d3da38..e6caa5d67 100644
--- a/packages/node_modules/@node-red/registry/lib/util.js
+++ b/packages/node_modules/@node-red/registry/lib/util.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  **/
 
-var path = require("path");
-var i18n = require("@node-red/util").i18n;
-var registry;
+const path = require("path");
+const semver = require("semver");
+const {events,i18n,log} = require("@node-red/util");
 var runtime;
 
 function copyObjectProperties(src,dst,copyList,blockList) {
@@ -40,7 +40,7 @@ function copyObjectProperties(src,dst,copyList,blockList) {
     }
 }
 function requireModule(name) {
-    var moduleInfo = registry.getModuleInfo(name);
+    var moduleInfo = require("./index").getModuleInfo(name);
     if (moduleInfo && moduleInfo.path) {
         var relPath = path.relative(__dirname, moduleInfo.path);
         return require(relPath);
@@ -56,20 +56,31 @@ function createNodeApi(node) {
         nodes: {},
         log: {},
         settings: {},
-        events: runtime.events,
+        events: events,
         hooks: runtime.hooks,
         util: runtime.util,
         version: runtime.version,
         require: requireModule,
         comms: {
             publish: function(topic,data,retain) {
-                runtime.events.emit("comms",{
+                events.emit("comms",{
                     topic: topic,
                     data: data,
                     retain: retain
                 })
             }
         },
+        plugins: {
+            registerPlugin: function(id,definition) {
+                return runtime.plugins.registerPlugin(node.id,id,definition);
+            },
+            get: function(id) {
+                return runtime.plugins.getPlugin(id);
+            },
+            getByType: function(type) {
+                return runtime.plugins.getPluginsByType(type);
+            }
+        },
         library: {
             register: function(type) {
                 return runtime.library.register(node.id,type);
@@ -83,7 +94,10 @@ function createNodeApi(node) {
     red.nodes.registerType = function(type,constructor,opts) {
         runtime.nodes.registerType(node.id,type,constructor,opts);
     }
-    copyObjectProperties(runtime.log,red.log,null,["init"]);
+    red.nodes.registerSubflow = function(subflowDef) {
+        runtime.nodes.registerSubflow(node.id,subflowDef)
+    }
+    copyObjectProperties(log,red.log,null,["init"]);
     copyObjectProperties(runtime.settings,red.settings,null,["init","load","reset"]);
     if (runtime.adminApi) {
         red.auth = runtime.adminApi.auth;
@@ -105,10 +119,78 @@ function createNodeApi(node) {
     return red;
 }
 
+
+function checkAgainstList(module,version,list) {
+    for (let i=0;i<list.length;i++) {
+        let rule = list[i];
+        if (rule.module.test(module)) {
+            if (version && rule.version) {
+                if (semver.satisfies(version,rule.version)) {
+                    return rule;
+                }
+            } else {
+                return rule;
+            }
+        }
+    }
+}
+
+function checkModuleAllowed(module,version,allowList,denyList) {
+    // console.log("checkModuleAllowed",module,version);//,allowList,denyList)
+    if (!allowList && !denyList) {
+        // Default to allow
+        return true;
+    }
+    if (allowList.length === 0 && denyList.length === 0) {
+        return true;
+    }
+
+    var allowedRule = checkAgainstList(module,version,allowList);
+    var deniedRule = checkAgainstList(module,version,denyList);
+    // console.log("A",allowedRule)
+    // console.log("D",deniedRule)
+
+    if (allowedRule && !deniedRule) {
+        return true;
+    }
+    if (!allowedRule && deniedRule) {
+        return false;
+    }
+    if (!allowedRule && !deniedRule) {
+        return true;
+    }
+    if (allowedRule.wildcardPos !== deniedRule.wildcardPos) {
+        return allowedRule.wildcardPos > deniedRule.wildcardPos
+    } else {
+        // First wildcard in same position.
+        // Go with the longer matching rule. This isn't going to be 100%
+        // right, but we are deep into edge cases at this point.
+        return allowedRule.module.toString().length > deniedRule.module.toString().length
+    }
+    return false;
+}
+
+function parseModuleList(list) {
+    list = list || ["*"];
+    return list.map(rule => {
+        let m = /^(.+?)(?:@(.*))?$/.exec(rule);
+        let wildcardPos = m[1].indexOf("*");
+        wildcardPos = wildcardPos===-1?Infinity:wildcardPos;
+
+        return {
+            module: new RegExp("^"+m[1].replace(/\*/g,".*")+"$"),
+            version: m[2],
+            wildcardPos: wildcardPos
+        }
+    })
+}
+
+
 module.exports = {
     init: function(_runtime) {
         runtime = _runtime;
-        registry = require("@node-red/registry/lib");
     },
-    createNodeApi: createNodeApi
+    createNodeApi: createNodeApi,
+    parseModuleList: parseModuleList,
+    checkModuleAllowed: checkModuleAllowed
 }
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 47472f38e..c2c533633 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -19,7 +19,6 @@
         "@node-red/util": "1.3.0-beta.1",
         "semver": "6.3.0",
         "tar": "6.0.5",
-        "uglify-js": "3.11.6",
-        "when": "3.7.8"
+        "uglify-js": "3.12.4"
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/comms.js b/packages/node_modules/@node-red/runtime/lib/api/comms.js
index 55789b806..90f1603cd 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/comms.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/comms.js
@@ -33,6 +33,7 @@ var runtime;
 var retained = {};
 var connections = [];
 
+const events = require("@node-red/util").events;
 
 function handleCommsEvent(event) {
     publish(event.topic,event.data,event.retain);
@@ -88,14 +89,14 @@ var api = module.exports = {
         runtime = _runtime;
         connections = [];
         retained = {};
-        runtime.events.removeListener("node-status",handleStatusEvent);
-        runtime.events.on("node-status",handleStatusEvent);
-        runtime.events.removeListener("runtime-event",handleRuntimeEvent);
-        runtime.events.on("runtime-event",handleRuntimeEvent);
-        runtime.events.removeListener("comms",handleCommsEvent);
-        runtime.events.on("comms",handleCommsEvent);
-        runtime.events.removeListener("event-log",handleEventLog);
-        runtime.events.on("event-log",handleEventLog);
+        events.removeListener("node-status",handleStatusEvent);
+        events.on("node-status",handleStatusEvent);
+        events.removeListener("runtime-event",handleRuntimeEvent);
+        events.on("runtime-event",handleRuntimeEvent);
+        events.removeListener("comms",handleCommsEvent);
+        events.on("comms",handleCommsEvent);
+        events.removeListener("event-log",handleEventLog);
+        events.on("event-log",handleEventLog);
     },
 
     /**
@@ -106,9 +107,8 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_comms
     */
-    addConnection: function(opts) {
+    addConnection: async function(opts) {
         connections.push(opts.client);
-        return Promise.resolve();
     },
 
     /**
@@ -119,14 +119,13 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_comms
     */
-    removeConnection: function(opts) {
+    removeConnection: async function(opts) {
         for (var i=0;i<connections.length;i++) {
             if (connections[i] === opts.client) {
                 connections.splice(i,1);
                 break;
             }
         }
-        return Promise.resolve();
     },
 
     /**
@@ -140,14 +139,13 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_comms
     */
-    subscribe: function(opts) {
+    subscribe: async function(opts) {
         var re = new RegExp("^"+opts.topic.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
         for (var t in retained) {
             if (re.test(t)) {
                 opts.client.send(t,retained[t]);
             }
         }
-        return Promise.resolve();
     },
 
     /**
@@ -159,5 +157,5 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_comms
     */
-    unsubscribe: function(opts) {}
+    unsubscribe: async function(opts) {}
 };
diff --git a/packages/node_modules/@node-red/runtime/lib/api/context.js b/packages/node_modules/@node-red/runtime/lib/api/context.js
index f69349a62..6716b6831 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/context.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/context.js
@@ -71,7 +71,7 @@ var api = module.exports = {
     * @return {Promise} - the node information
     * @memberof @node-red/runtime_context
     */
-    getValue: function(opts) {
+    getValue: async function(opts) {
         return new Promise(function(resolve,reject) {
             var scope = opts.scope;
             var id = opts.id;
@@ -165,7 +165,7 @@ var api = module.exports = {
     * @return {Promise} - the node information
     * @memberof @node-red/runtime_context
     */
-    delete: function(opts) {
+    delete: async function(opts) {
         return new Promise(function(resolve,reject) {
             var scope = opts.scope;
             var id = opts.id;
diff --git a/packages/node_modules/@node-red/runtime/lib/api/index.js b/packages/node_modules/@node-red/runtime/lib/api/index.js
index 8856ac3c2..46d15d1e7 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/index.js
@@ -28,6 +28,7 @@ var api = module.exports = {
         api.library.init(runtime);
         api.projects.init(runtime);
         api.context.init(runtime);
+        api.plugins.init(runtime);
     },
 
     comms: require("./comms"),
@@ -37,11 +38,12 @@ var api = module.exports = {
     settings: require("./settings"),
     projects: require("./projects"),
     context: require("./context"),
+    plugins: require("./plugins"),
 
-    isStarted: function(opts) {
-        return Promise.resolve(runtime.isStarted());
+    isStarted: async function(opts) {
+        return runtime.isStarted();
     },
-    version: function(opts) {
-        return Promise.resolve(runtime.version());
+    version: async function(opts) {
+        return runtime.version();
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/library.js b/packages/node_modules/@node-red/runtime/lib/api/library.js
index f252d3264..6b7ed6218 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/library.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/library.js
@@ -36,32 +36,30 @@ var api = module.exports = {
     * @return {Promise<String|Object>} - resolves when complete
     * @memberof @node-red/runtime_library
     */
-    getEntry: function(opts) {
-        return new Promise(function(resolve,reject) {
-            runtime.library.getEntry(opts.library,opts.type,opts.path).then(function(result) {
-                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path}, opts.req);
-                return resolve(result);
-            }).catch(function(err) {
-                if (err) {
-                    runtime.log.warn(runtime.log._("api.library.error-load-entry",{library:opts.library,type:opts.type,path:opts.path,message:err.toString()}));
-                    if (err.code === 'forbidden') {
-                        err.status = 403;
-                        return reject(err);
-                    } else if (err.code === "not_found") {
-                        err.status = 404;
-                    } else {
-                        err.status = 400;
-                    }
-                    runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path,error:err.code}, opts.req);
-                    return reject(err);
+    getEntry: async function(opts) {
+        return runtime.library.getEntry(opts.library,opts.type,opts.path).then(function(result) {
+            runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path}, opts.req);
+            return result;
+        }).catch(function(err) {
+            if (err) {
+                runtime.log.warn(runtime.log._("api.library.error-load-entry",{library:opts.library,type:opts.type,path:opts.path,message:err.toString()}));
+                if (err.code === 'forbidden') {
+                    err.status = 403;
+                    throw err;
+                } else if (err.code === "not_found") {
+                    err.status = 404;
+                } else {
+                    err.status = 400;
                 }
-                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,error:"not_found"}, opts.req);
-                var error = new Error();
-                error.code = "not_found";
-                error.status = 404;
-                return reject(error);
-            });
-        })
+                runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,path:opts.path,error:err.code}, opts.req);
+                throw err;
+            }
+            runtime.log.audit({event: "library.get",library:opts.library,type:opts.type,error:"not_found"}, opts.req);
+            var error = new Error();
+            error.code = "not_found";
+            error.status = 404;
+            throw error;
+        });
     },
 
     /**
@@ -77,23 +75,20 @@ var api = module.exports = {
     * @return {Promise} - resolves when complete
     * @memberof @node-red/runtime_library
     */
-    saveEntry: function(opts) {
-        return new Promise(function(resolve,reject) {
-            runtime.library.saveEntry(opts.library,opts.type,opts.path,opts.meta,opts.body).then(function() {
-                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path}, opts.req);
-                return resolve();
-            }).catch(function(err) {
-                runtime.log.warn(runtime.log._("api.library.error-save-entry",{path:opts.path,message:err.toString()}));
-                if (err.code === 'forbidden') {
-                    runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"forbidden"}, opts.req);
-                    err.status = 403;
-                    return reject(err);
-                }
-                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"unexpected_error",message:err.toString()}, opts.req);
-                var error = new Error();
-                error.status = 400;
-                return reject(error);
-            });
-        })
+    saveEntry: async function(opts) {
+        return runtime.library.saveEntry(opts.library,opts.type,opts.path,opts.meta,opts.body).then(function() {
+            runtime.log.audit({event: "library.set",type:opts.type,path:opts.path}, opts.req);
+        }).catch(function(err) {
+            runtime.log.warn(runtime.log._("api.library.error-save-entry",{path:opts.path,message:err.toString()}));
+            if (err.code === 'forbidden') {
+                runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"forbidden"}, opts.req);
+                err.status = 403;
+                throw err;
+            }
+            runtime.log.audit({event: "library.set",type:opts.type,path:opts.path,error:"unexpected_error",message:err.toString()}, opts.req);
+            var error = new Error();
+            error.status = 400;
+            throw error;
+        });
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/nodes.js b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
index a06cbed96..db4ed32a5 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/nodes.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/nodes.js
@@ -18,7 +18,7 @@
  * @mixin @node-red/runtime_nodes
  */
 
-var fs = require("fs");
+var fs = require("fs-extra");
 
 var runtime;
 
@@ -52,22 +52,20 @@ var api = module.exports = {
     * @return {Promise<NodeInfo>} - the node information
     * @memberof @node-red/runtime_nodes
     */
-    getNodeInfo: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var id = opts.id;
-            var result = runtime.nodes.getNodeInfo(id);
-            if (result) {
-                runtime.log.audit({event: "nodes.info.get",id:id}, opts.req);
-                delete result.loaded;
-                return resolve(result);
-            } else {
-                runtime.log.audit({event: "nodes.info.get",id:id,error:"not_found"}, opts.req);
-                var err = new Error("Node not found");
-                err.code = "not_found";
-                err.status = 404;
-                return reject(err);
-            }
-        })
+    getNodeInfo: async function(opts) {
+        var id = opts.id;
+        var result = runtime.nodes.getNodeInfo(id);
+        if (result) {
+            runtime.log.audit({event: "nodes.info.get",id:id}, opts.req);
+            delete result.loaded;
+            return result;
+        } else {
+            runtime.log.audit({event: "nodes.info.get",id:id,error:"not_found"}, opts.req);
+            var err = new Error("Node not found");
+            err.code = "not_found";
+            err.status = 404;
+            throw err;
+        }
     },
 
     /**
@@ -78,11 +76,9 @@ var api = module.exports = {
     * @return {Promise<NodeList>} - the list of node modules
     * @memberof @node-red/runtime_nodes
     */
-    getNodeList: function(opts) {
-        return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "nodes.list.get"}, opts.req);
-            return resolve(runtime.nodes.getNodeList());
-        })
+    getNodeList: async function(opts) {
+        runtime.log.audit({event: "nodes.list.get"}, opts.req);
+        return runtime.nodes.getNodeList();
     },
 
     /**
@@ -95,22 +91,24 @@ var api = module.exports = {
     * @return {Promise<String>} - the node html content
     * @memberof @node-red/runtime_nodes
     */
-    getNodeConfig: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var id = opts.id;
-            var lang = opts.lang;
-            var result = runtime.nodes.getNodeConfig(id,lang);
-            if (result) {
-                runtime.log.audit({event: "nodes.config.get",id:id}, opts.req);
-                return resolve(result);
-            } else {
-                runtime.log.audit({event: "nodes.config.get",id:id,error:"not_found"}, opts.req);
-                var err = new Error("Node not found");
-                err.code = "not_found";
-                err.status = 404;
-                return reject(err);
-            }
-        });
+    getNodeConfig: async function(opts) {
+        var id = opts.id;
+        var lang = opts.lang;
+        if (/[^a-z\-\*]/i.test(opts.lang)) {
+            reject(new Error("Invalid language: "+opts.lang));
+            return
+        }
+        var result = runtime.nodes.getNodeConfig(id,lang);
+        if (result) {
+            runtime.log.audit({event: "nodes.config.get",id:id}, opts.req);
+            return result;
+        } else {
+            runtime.log.audit({event: "nodes.config.get",id:id,error:"not_found"}, opts.req);
+            var err = new Error("Node not found");
+            err.code = "not_found";
+            err.status = 404;
+            throw err;
+        }
     },
     /**
     * Gets all node html content
@@ -121,11 +119,13 @@ var api = module.exports = {
     * @return {Promise<String>} - the node html content
     * @memberof @node-red/runtime_nodes
     */
-    getNodeConfigs: function(opts) {
-        return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "nodes.configs.get"}, opts.req);
-            return resolve(runtime.nodes.getNodeConfigs(opts.lang));
-        });
+    getNodeConfigs: async function(opts) {
+        if (/[^a-z\-\*]/i.test(opts.lang)) {
+            reject(new Error("Invalid language: "+opts.lang));
+            return
+        }
+        runtime.log.audit({event: "nodes.configs.get"}, opts.req);
+        return runtime.nodes.getNodeConfigs(opts.lang);
     },
 
     /**
@@ -137,20 +137,18 @@ var api = module.exports = {
     * @return {Promise<ModuleInfo>} - the node module info
     * @memberof @node-red/runtime_nodes
     */
-    getModuleInfo: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var result = runtime.nodes.getModuleInfo(opts.module);
-            if (result) {
-                runtime.log.audit({event: "nodes.module.get",id:opts.module}, opts.req);
-                return resolve(result);
-            } else {
-                runtime.log.audit({event: "nodes.module.get",id:opts.module,error:"not_found"}, opts.req);
-                var err = new Error("Module not found");
-                err.code = "not_found";
-                err.status = 404;
-                return reject(err);
-            }
-        })
+    getModuleInfo: async function(opts) {
+        var result = runtime.nodes.getModuleInfo(opts.module);
+        if (result) {
+            runtime.log.audit({event: "nodes.module.get",id:opts.module}, opts.req);
+            return result;
+        } else {
+            runtime.log.audit({event: "nodes.module.get",id:opts.module,error:"not_found"}, opts.req);
+            var err = new Error("Module not found");
+            err.code = "not_found";
+            err.status = 404;
+            throw err;
+        }
     },
 
     /**
@@ -165,83 +163,78 @@ var api = module.exports = {
     * @return {Promise<ModuleInfo>} - the node module info
     * @memberof @node-red/runtime_nodes
     */
-    addModule: function(opts) {
-        return new Promise(function(resolve,reject) {
-            if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}, opts.req);
-                var err = new Error("Settings unavailable");
-                err.code = "settings_unavailable";
-                err.status = 400;
-                return reject(err);
-            }
-            if (opts.tarball) {
-                if (runtime.settings.editorTheme && runtime.settings.editorTheme.palette && runtime.settings.editorTheme.palette.upload === false) {
-                    runtime.log.audit({event: "nodes.install",tarball:opts.tarball.file,error:"invalid_request"}, opts.req);
-                    var err = new Error("Invalid request");
-                    err.code = "invalid_request";
-                    err.status = 400;
-                    return reject(err);
-                }
-                if (opts.module || opts.version || opts.url) {
-                    runtime.log.audit({event: "nodes.install",tarball:opts.tarball.file,module:opts.module,error:"invalid_request"}, opts.req);
-                    var err = new Error("Invalid request");
-                    err.code = "invalid_request";
-                    err.status = 400;
-                    return reject(err);
-                }
-                runtime.nodes.installModule(opts.tarball.buffer).then(function(info) {
-                    runtime.log.audit({event: "nodes.install",tarball:opts.tarball.file,module:info.id}, opts.req);
-                    return resolve(info);
-                }).catch(function(err) {
-
-                    if (err.code) {
-                        err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code}, opts.req);
-                    } else {
-                        err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
-                    }
-                    return reject(err);
-                })
-                return;
-            }
-            if (opts.module) {
-                var existingModule = runtime.nodes.getModuleInfo(opts.module);
-                if (existingModule) {
-                    if (!opts.version || existingModule.version === opts.version) {
-                        runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"}, opts.req);
-                        var err = new Error("Module already loaded");
-                        err.code = "module_already_loaded";
-                        err.status = 400;
-                        return reject(err);
-                    }
-                }
-                runtime.nodes.installModule(opts.module,opts.version,opts.url).then(function(info) {
-                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url}, opts.req);
-                    return resolve(info);
-                }).catch(function(err) {
-                    if (err.code === 404) {
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:"not_found"}, opts.req);
-                        // TODO: code/status
-                        err.status = 404;
-                    } else if (err.code) {
-                        err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code}, opts.req);
-                    } else {
-                        err.status = 400;
-                        runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
-                    }
-                    return reject(err);
-                })
-            } else {
-                runtime.log.audit({event: "nodes.install",module:opts.module,error:"invalid_request"}, opts.req);
+    addModule: async function(opts) {
+        if (!runtime.settings.available()) {
+            runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}, opts.req);
+            var err = new Error("Settings unavailable");
+            err.code = "settings_unavailable";
+            err.status = 400;
+            throw err;
+        }
+        if (opts.tarball) {
+            if (runtime.settings.externalModules && runtime.settings.externalModules.palette && runtime.settings.externalModules.palette.upload === false) {
+                runtime.log.audit({event: "nodes.install",tarball:opts.tarball.file,error:"invalid_request"}, opts.req);
                 var err = new Error("Invalid request");
                 err.code = "invalid_request";
                 err.status = 400;
-                return reject(err);
+                throw err;
             }
-
-        });
+            if (opts.module || opts.version || opts.url) {
+                runtime.log.audit({event: "nodes.install",tarball:opts.tarball.file,module:opts.module,error:"invalid_request"}, opts.req);
+                var err = new Error("Invalid request");
+                err.code = "invalid_request";
+                err.status = 400;
+                throw err;
+            }
+            return runtime.nodes.installModule(opts.tarball.buffer).then(function(info) {
+                runtime.log.audit({event: "nodes.install",tarball:opts.tarball.file,module:info.id}, opts.req);
+                return info;
+            }).catch(function(err) {
+                if (err.code) {
+                    err.status = 400;
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code}, opts.req);
+                } else {
+                    err.status = 400;
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
+                }
+                throw err;
+            })
+        }
+        if (opts.module) {
+            var existingModule = runtime.nodes.getModuleInfo(opts.module);
+            if (existingModule && existingModule.user) {
+                if (!opts.version || existingModule.version === opts.version) {
+                    runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"}, opts.req);
+                    var err = new Error("Module already loaded");
+                    err.code = "module_already_loaded";
+                    err.status = 400;
+                    throw err;
+                }
+            }
+            return runtime.nodes.installModule(opts.module,opts.version,opts.url).then(function(info) {
+                runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url}, opts.req);
+                return info;
+            }).catch(function(err) {
+                if (err.code === 404) {
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:"not_found"}, opts.req);
+                    // TODO: code/status
+                    err.status = 404;
+                } else if (err.code) {
+                    err.status = 400;
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code}, opts.req);
+                } else {
+                    err.status = 400;
+                    runtime.log.audit({event: "nodes.install",module:opts.module,version:opts.version,url:opts.url,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
+                }
+                throw err;
+            })
+        } else {
+            runtime.log.audit({event: "nodes.install",module:opts.module,error:"invalid_request"}, opts.req);
+            var err = new Error("Invalid request");
+            err.code = "invalid_request";
+            err.status = 400;
+            throw err;
+        }
     },
     /**
     * Removes a module from the runtime
@@ -252,38 +245,35 @@ var api = module.exports = {
     * @return {Promise} - resolves when complete
     * @memberof @node-red/runtime_nodes
     */
-    removeModule: function(opts) {
-        return new Promise(function(resolve,reject) {
-            if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}, opts.req);
-                var err = new Error("Settings unavailable");
-                err.code = "settings_unavailable";
+    removeModule: async function(opts) {
+        if (!runtime.settings.available()) {
+            runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}, opts.req);
+            var err = new Error("Settings unavailable");
+            err.code = "settings_unavailable";
+            err.status = 400;
+            throw err;
+        }
+        var module = runtime.nodes.getModuleInfo(opts.module);
+        if (!module) {
+            runtime.log.audit({event: "nodes.remove",module:opts.module,error:"not_found"}, opts.req);
+            var err = new Error("Module not found");
+            err.code = "not_found";
+            err.status = 404;
+            throw err;
+        }
+        try {
+            return runtime.nodes.uninstallModule(opts.module).then(function() {
+                runtime.log.audit({event: "nodes.remove",module:opts.module}, opts.req);
+            }).catch(function(err) {
                 err.status = 400;
-                return reject(err);
-            }
-            var module = runtime.nodes.getModuleInfo(opts.module);
-            if (!module) {
-                runtime.log.audit({event: "nodes.remove",module:opts.module,error:"not_found"}, opts.req);
-                var err = new Error("Module not found");
-                err.code = "not_found";
-                err.status = 404;
-                return reject(err);
-            }
-            try {
-                runtime.nodes.uninstallModule(opts.module).then(function() {
-                    runtime.log.audit({event: "nodes.remove",module:opts.module}, opts.req);
-                    resolve();
-                }).catch(function(err) {
-                    err.status = 400;
-                    runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
-                    return reject(err);
-                })
-            } catch(error) {
-                runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
-                error.status = 400;
-                return reject(error);
-            }
-        });
+                runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
+                throw err;
+            })
+        } catch(error) {
+            runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
+            error.status = 400;
+            throw err;
+        }
     },
 
     /**
@@ -296,43 +286,41 @@ var api = module.exports = {
     * @return {Promise<ModuleInfo>} - the module info object
     * @memberof @node-red/runtime_nodes
     */
-    setModuleState: function(opts) {
+    setModuleState: async function(opts) {
         var mod = opts.module;
-        return new Promise(function(resolve,reject) {
-            if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.module.set",error:"settings_unavailable"}, opts.req);
-                var err = new Error("Settings unavailable");
-                err.code = "settings_unavailable";
-                err.status = 400;
-                return reject(err);
+        if (!runtime.settings.available()) {
+            runtime.log.audit({event: "nodes.module.set",error:"settings_unavailable"}, opts.req);
+            var err = new Error("Settings unavailable");
+            err.code = "settings_unavailable";
+            err.status = 400;
+            throw err;
+        }
+        try {
+            var module = runtime.nodes.getModuleInfo(mod);
+            if (!module) {
+                runtime.log.audit({event: "nodes.module.set",module:mod,error:"not_found"}, opts.req);
+                var err = new Error("Module not found");
+                err.code = "not_found";
+                err.status = 404;
+                throw err;
             }
-            try {
-                var module = runtime.nodes.getModuleInfo(mod);
-                if (!module) {
-                    runtime.log.audit({event: "nodes.module.set",module:mod,error:"not_found"}, opts.req);
-                    var err = new Error("Module not found");
-                    err.code = "not_found";
-                    err.status = 404;
-                    return reject(err);
-                }
 
-                var nodes = module.nodes;
-                var promises = [];
-                for (var i = 0; i < nodes.length; ++i) {
-                    promises.push(putNode(nodes[i],opts.enabled));
-                }
-                Promise.all(promises).then(function() {
-                    return resolve(runtime.nodes.getModuleInfo(mod));
-                }).catch(function(err) {
-                    err.status = 400;
-                    return reject(err);
-                });
-            } catch(error) {
-                runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
-                error.status = 400;
-                return reject(error);
+            var nodes = module.nodes;
+            var promises = [];
+            for (var i = 0; i < nodes.length; ++i) {
+                promises.push(putNode(nodes[i],opts.enabled));
             }
-        });
+            return Promise.all(promises).then(function() {
+                return runtime.nodes.getModuleInfo(mod);
+            }).catch(function(err) {
+                err.status = 400;
+                throw err;
+            });
+        } catch(error) {
+            runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
+            error.status = 400;
+            throw err;
+        }
     },
 
     /**
@@ -345,43 +333,41 @@ var api = module.exports = {
     * @return {Promise<ModuleInfo>} - the module info object
     * @memberof @node-red/runtime_nodes
     */
-    setNodeSetState: function(opts) {
-        return new Promise(function(resolve,reject) {
-            if (!runtime.settings.available()) {
-                runtime.log.audit({event: "nodes.info.set",error:"settings_unavailable"}, opts.req);
-                var err = new Error("Settings unavailable");
-                err.code = "settings_unavailable";
-                err.status = 400;
-                return reject(err);
-            }
+    setNodeSetState: async function(opts) {
+        if (!runtime.settings.available()) {
+            runtime.log.audit({event: "nodes.info.set",error:"settings_unavailable"}, opts.req);
+            var err = new Error("Settings unavailable");
+            err.code = "settings_unavailable";
+            err.status = 400;
+            throw err;
+        }
 
-            var id = opts.id;
-            var enabled = opts.enabled;
-            try {
-                var node = runtime.nodes.getNodeInfo(id);
-                if (!node) {
-                    runtime.log.audit({event: "nodes.info.set",id:id,error:"not_found"}, opts.req);
-                    var err = new Error("Node not found");
-                    err.code = "not_found";
-                    err.status = 404;
-                    return reject(err);
-                } else {
-                    delete node.loaded;
-                    putNode(node,enabled).then(function(result) {
-                        runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled}, opts.req);
-                        return resolve(result);
-                    }).catch(function(err) {
-                        runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
-                        err.status = 400;
-                        return reject(err);
-                    });
-                }
-            } catch(error) {
-                runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
-                error.status = 400;
-                return reject(error);
+        var id = opts.id;
+        var enabled = opts.enabled;
+        try {
+            var node = runtime.nodes.getNodeInfo(id);
+            if (!node) {
+                runtime.log.audit({event: "nodes.info.set",id:id,error:"not_found"}, opts.req);
+                var err = new Error("Node not found");
+                err.code = "not_found";
+                err.status = 404;
+                throw err;
+            } else {
+                delete node.loaded;
+                return putNode(node,enabled).then(function(result) {
+                    runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled}, opts.req);
+                    return result;
+                }).catch(function(err) {
+                    runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
+                    err.status = 400;
+                    throw err;
+                });
             }
-        });
+        } catch(error) {
+            runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()}, opts.req);
+            error.status = 400;
+            throw err;
+        }
     },
 
     /**
@@ -393,12 +379,16 @@ var api = module.exports = {
     * @return {Promise<Object>} - the message catalogs
     * @memberof @node-red/runtime_nodes
     */
-    getModuleCatalogs: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var namespace = opts.module;
-            var lang = opts.lang;
-            var prevLang = runtime.i18n.i.language;
-            // Trigger a load from disk of the language if it is not the default
+    getModuleCatalogs: async function(opts) {
+        var namespace = opts.module;
+        var lang = opts.lang;
+        if (/[^a-z\-\*]/i.test(lang)) {
+            reject(new Error("Invalid language: "+lang));
+            return
+        }
+        var prevLang = runtime.i18n.i.language;
+        // Trigger a load from disk of the language if it is not the default
+        return new Promise( (resolve,reject) => {
             runtime.i18n.i.changeLanguage(lang, function(){
                 var nodeList = runtime.nodes.getNodeList();
                 var result = {};
@@ -407,9 +397,9 @@ var api = module.exports = {
                         result[n.id] = runtime.i18n.i.getResourceBundle(lang, n.id)||{};
                     }
                 });
+                runtime.i18n.i.changeLanguage(prevLang);
                 resolve(result);
             });
-            runtime.i18n.i.changeLanguage(prevLang);
         });
     },
 
@@ -423,17 +413,21 @@ var api = module.exports = {
     * @return {Promise<Object>} - the message catalog
     * @memberof @node-red/runtime_nodes
     */
-    getModuleCatalog: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var namespace = opts.module;
-            var lang = opts.lang;
-            var prevLang = runtime.i18n.i.language;
-            // Trigger a load from disk of the language if it is not the default
-            runtime.i18n.i.changeLanguage(lang, function(){
+    getModuleCatalog: async function(opts) {
+        var namespace = opts.module;
+        var lang = opts.lang;
+        if (/[^a-z\-\*]/i.test(lang)) {
+            reject(new Error("Invalid language: "+lang));
+            return
+        }
+        var prevLang = runtime.i18n.i.language;
+        // Trigger a load from disk of the language if it is not the default
+        return new Promise(resolve => {
+            runtime.i18n.i.changeLanguage(lang, function() {
                 var catalog = runtime.i18n.i.getResourceBundle(lang, namespace);
+                runtime.i18n.i.changeLanguage(prevLang);
                 resolve(catalog||{});
             });
-            runtime.i18n.i.changeLanguage(prevLang);
         });
     },
 
@@ -445,12 +439,9 @@ var api = module.exports = {
     * @return {Promise<IconList>} - the list of all icons
     * @memberof @node-red/runtime_nodes
     */
-    getIconList: function(opts) {
-        return new Promise(function(resolve,reject) {
-            runtime.log.audit({event: "nodes.icons.get"}, opts.req);
-            return resolve(runtime.nodes.getNodeIcons());
-        });
-
+    getIconList: async function(opts) {
+        runtime.log.audit({event: "nodes.icons.get"}, opts.req);
+        return runtime.nodes.getNodeIcons();
     },
     /**
     * Gets a node icon
@@ -462,20 +453,15 @@ var api = module.exports = {
     * @return {Promise<Buffer>} - the icon file as a Buffer or null if no icon available
     * @memberof @node-red/runtime_nodes
     */
-    getIcon: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var iconPath = runtime.nodes.getNodeIconPath(opts.module,opts.icon);
-            if (iconPath) {
-                fs.readFile(iconPath,function(err,data) {
-                    if (err) {
-                        err.status = 400;
-                        return reject(err);
-                    }
-                    return resolve(data)
-                });
-            } else {
-                resolve(null);
-            }
-        });
+    getIcon: async function(opts) {
+        var iconPath = runtime.nodes.getNodeIconPath(opts.module,opts.icon);
+        if (iconPath) {
+            return fs.readFile(iconPath).catch(err => {
+                err.status = 400;
+                throw err;
+            });
+        } else {
+            return null
+        }
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/plugins.js b/packages/node_modules/@node-red/runtime/lib/api/plugins.js
new file mode 100644
index 000000000..076638640
--- /dev/null
+++ b/packages/node_modules/@node-red/runtime/lib/api/plugins.js
@@ -0,0 +1,95 @@
+/**
+ * @mixin @node-red/runtime_plugins
+ */
+
+var runtime;
+
+var api = module.exports = {
+    init: function(_runtime) {
+        runtime = _runtime;
+    },
+
+    /**
+    * Gets a plugin definition from the registry
+    * @param {Object} opts
+    * @param {String} opts.id - the id of the plugin to get
+    * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
+    * @return {Promise<PluginDefinition>} - the plugin definition
+    * @memberof @node-red/runtime_plugins
+    */
+    getPlugin: async function(opts) {
+        return runtime.plugins.getPlugin(opts.id);
+    },
+
+    /**
+    * Gets all plugin definitions of a given type
+    * @param {Object} opts
+    * @param {String} opts.type - the type of the plugins to get
+    * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
+    * @return {Promise<Array>} - the plugin definitions
+    * @memberof @node-red/runtime_plugins
+    */
+    getPluginsByType: async function(opts) {
+        return runtime.plugins.getPluginsByType(opts.type);
+    },
+
+    /**
+    * Gets the editor content for an individual plugin
+    * @param {String} opts.lang - the locale language to return
+    * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
+    * @return {Promise<NodeInfo>} - the node information
+    * @memberof @node-red/runtime_plugins
+    */
+    getPluginList: async function(opts) {
+        runtime.log.audit({event: "plugins.list.get"}, opts.req);
+        return runtime.plugins.getPluginList();
+    },
+
+    /**
+    * Gets the editor content for all registered plugins
+    * @param {Object} opts
+    * @param {User} opts.user - the user calling the api
+    * @param {User} opts.user - the user calling the api
+    * @param {Object} opts.req - the request to log (optional)
+    * @return {Promise<NodeInfo>} - the node information
+    * @memberof @node-red/runtime_plugins
+    */
+    getPluginConfigs: async function(opts) {
+        if (/[^a-z\-]/i.test(opts.lang)) {
+            throw new Error("Invalid language: "+opts.lang)
+            return;
+        }
+        runtime.log.audit({event: "plugins.configs.get"}, opts.req);
+        return runtime.plugins.getPluginConfigs(opts.lang);
+    },
+    /**
+    * Gets all registered module message catalogs
+    * @param {Object} opts
+    * @param {User} opts.user - the user calling the api
+    * @param {User} opts.lang - the i18n language to return. If not set, uses runtime default (en-US)
+    * @param {Object} opts.req - the request to log (optional)
+    * @return {Promise<Object>} - the message catalogs
+    * @memberof @node-red/runtime_plugins
+    */
+    getPluginCatalogs: async function(opts) {
+        var lang = opts.lang;
+        var prevLang = runtime.i18n.i.language;
+        // Trigger a load from disk of the language if it is not the default
+        return new Promise( (resolve,reject) => {
+            runtime.i18n.i.changeLanguage(lang, function(){
+                var nodeList = runtime.plugins.getPluginList();
+                var result = {};
+                nodeList.forEach(function(n) {
+                    if (n.module !== "node-red") {
+                        result[n.id] = runtime.i18n.i.getResourceBundle(lang, n.id)||{};
+                    }
+                });
+                runtime.i18n.i.changeLanguage(prevLang);
+                resolve(result);
+            });
+        });
+    },
+}
diff --git a/packages/node_modules/@node-red/runtime/lib/api/projects.js b/packages/node_modules/@node-red/runtime/lib/api/projects.js
index d792f3765..14d1d0ec1 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/projects.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/projects.js
@@ -24,8 +24,8 @@ var api = module.exports = {
     init: function(_runtime) {
         runtime = _runtime;
     },
-    available: function(opts) {
-        return Promise.resolve(!!runtime.storage.projects);
+    available: async function(opts) {
+        return !!runtime.storage.projects;
     },
     /**
     * List projects known to the runtime
@@ -36,7 +36,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    listProjects: function(opts) {
+    listProjects: async function(opts) {
         return runtime.storage.projects.listProjects(opts.user).then(function(list) {
             var active = runtime.storage.projects.getActiveProject(opts.user);
             var response = {
@@ -61,7 +61,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    createProject: function(opts) {
+    createProject: async function(opts) {
         runtime.log.audit({event: "projects.create",name:opts.project?opts.project.name:"missing-name"}, opts.req);
         return runtime.storage.projects.createProject(opts.user, opts.project)
     },
@@ -76,7 +76,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    initialiseProject: function(opts) {
+    initialiseProject: async function(opts) {
         // Initialised set when creating default files for an empty repo
         runtime.log.audit({event: "projects.initialise",id:opts.id}, opts.req);
         return runtime.storage.projects.initialiseProject(opts.user, opts.id, opts.project)
@@ -90,8 +90,8 @@ var api = module.exports = {
     * @return {Promise<Object>} - the active project
     * @memberof @node-red/runtime_projects
     */
-    getActiveProject: function(opts) {
-        return Promise.resolve(runtime.storage.projects.getActiveProject(opts.user));
+    getActiveProject: async function(opts) {
+        return runtime.storage.projects.getActiveProject(opts.user);
     },
 
     /**
@@ -103,13 +103,11 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    setActiveProject: function(opts) {
+    setActiveProject: async function(opts) {
         var currentProject = runtime.storage.projects.getActiveProject(opts.user);
         runtime.log.audit({event: "projects.set",id:opts.id}, opts.req);
         if (!currentProject || opts.id !== currentProject.name) {
             return runtime.storage.projects.setActiveProject(opts.user, opts.id);
-        } else {
-            return Promise.resolve();
         }
     },
 
@@ -122,7 +120,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - the project metadata
     * @memberof @node-red/runtime_projects
     */
-    getProject: function(opts) {
+    getProject: async function(opts) {
         return runtime.storage.projects.getProject(opts.user, opts.id)
     },
 
@@ -136,7 +134,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    updateProject: function(opts) {
+    updateProject: async function(opts) {
         runtime.log.audit({event: "projects.update",id:opts.id}, opts.req);
         return runtime.storage.projects.updateProject(opts.user, opts.id, opts.project);
     },
@@ -150,7 +148,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    deleteProject: function(opts) {
+    deleteProject: async function(opts) {
         runtime.log.audit({event: "projects.delete",id:opts.id}, opts.req);
         return runtime.storage.projects.deleteProject(opts.user, opts.id);
     },
@@ -165,7 +163,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - the project status
     * @memberof @node-red/runtime_projects
     */
-    getStatus: function(opts) {
+    getStatus: async function(opts) {
         return runtime.storage.projects.getStatus(opts.user, opts.id, opts.remote)
     },
 
@@ -179,7 +177,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - a list of the local branches
     * @memberof @node-red/runtime_projects
     */
-    getBranches: function(opts) {
+    getBranches: async function(opts) {
         return runtime.storage.projects.getBranches(opts.user, opts.id, opts.remote);
     },
 
@@ -193,7 +191,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - the status of the branch
     * @memberof @node-red/runtime_projects
     */
-    getBranchStatus: function(opts) {
+    getBranchStatus: async function(opts) {
         return runtime.storage.projects.getBranchStatus(opts.user, opts.id, opts.branch);
     },
 
@@ -208,7 +206,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    setBranch: function(opts) {
+    setBranch: async function(opts) {
         runtime.log.audit({event: "projects.branch.set",id:opts.id, branch: opts.branch, create:opts.create}, opts.req);
         return runtime.storage.projects.setBranch(opts.user, opts.id, opts.branch, opts.create)
     },
@@ -224,7 +222,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    deleteBranch: function(opts) {
+    deleteBranch: async function(opts) {
         runtime.log.audit({event: "projects.branch.delete",id:opts.id, branch: opts.branch, force:opts.force}, opts.req);
         return runtime.storage.projects.deleteBranch(opts.user, opts.id, opts.branch, false, opts.force);
     },
@@ -239,7 +237,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    commit: function(opts) {
+    commit: async function(opts) {
         runtime.log.audit({event: "projects.commit",id:opts.id}, opts.req);
         return runtime.storage.projects.commit(opts.user, opts.id,{message: opts.message});
     },
@@ -254,7 +252,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - the commit details
     * @memberof @node-red/runtime_projects
     */
-    getCommit: function(opts) {
+    getCommit: async function(opts) {
         return runtime.storage.projects.getCommit(opts.user, opts.id, opts.sha);
     },
 
@@ -269,7 +267,7 @@ var api = module.exports = {
     * @return {Promise<Array>} - an array of commits
     * @memberof @node-red/runtime_projects
     */
-    getCommits: function(opts) {
+    getCommits: async function(opts) {
         return runtime.storage.projects.getCommits(opts.user, opts.id, {
             limit: opts.limit || 20,
             before: opts.before
@@ -285,7 +283,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    abortMerge: function(opts) {
+    abortMerge: async function(opts) {
         runtime.log.audit({event: "projects.merge.abort",id:opts.id}, opts.req);
         return runtime.storage.projects.abortMerge(opts.user, opts.id);
     },
@@ -301,7 +299,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    resolveMerge: function(opts) {
+    resolveMerge: async function(opts) {
         runtime.log.audit({event: "projects.merge.resolve",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.resolveMerge(opts.user, opts.id, opts.path, opts.resolution);
     },
@@ -315,7 +313,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - the file listing
     * @memberof @node-red/runtime_projects
     */
-    getFiles: function(opts) {
+    getFiles: async function(opts) {
         return runtime.storage.projects.getFiles(opts.user, opts.id);
     },
 
@@ -330,7 +328,7 @@ var api = module.exports = {
     * @return {Promise<String>} - the content of the file
     * @memberof @node-red/runtime_projects
     */
-    getFile: function(opts) {
+    getFile: async function(opts) {
         return runtime.storage.projects.getFile(opts.user, opts.id,opts.path,opts.tree);
     },
 
@@ -344,7 +342,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    stageFile: function(opts) {
+    stageFile: async function(opts) {
         runtime.log.audit({event: "projects.file.stage",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.stageFile(opts.user, opts.id, opts.path);
     },
@@ -359,7 +357,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    unstageFile: function(opts) {
+    unstageFile: async function(opts) {
         runtime.log.audit({event: "projects.file.unstage",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.unstageFile(opts.user, opts.id, opts.path);
     },
@@ -374,7 +372,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    revertFile: function(opts) {
+    revertFile: async function(opts) {
         runtime.log.audit({event: "projects.file.revert",id:opts.id, file:opts.path}, opts.req);
         return runtime.storage.projects.revertFile(opts.user, opts.id,opts.path)
     },
@@ -390,7 +388,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - the requested diff
     * @memberof @node-red/runtime_projects
     */
-    getFileDiff: function(opts) {
+    getFileDiff: async function(opts) {
         return runtime.storage.projects.getFileDiff(opts.user, opts.id, opts.path, opts.type);
     },
 
@@ -403,7 +401,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - a list of project remotes
     * @memberof @node-red/runtime_projects
     */
-    getRemotes: function(opts) {
+    getRemotes: async function(opts) {
         return runtime.storage.projects.getRemotes(opts.user, opts.id);
 
     },
@@ -420,7 +418,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    addRemote: function(opts) {
+    addRemote: async function(opts) {
         runtime.log.audit({event: "projects.remote.add",id:opts.id, remote:opts.remote.name}, opts.req);
         return runtime.storage.projects.addRemote(opts.user, opts.id, opts.remote)
     },
@@ -435,7 +433,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    removeRemote: function(opts) {
+    removeRemote: async function(opts) {
         runtime.log.audit({event: "projects.remote.delete",id:opts.id, remote:opts.remote}, opts.req);
         return runtime.storage.projects.removeRemote(opts.user, opts.id, opts.remote);
     },
@@ -451,7 +449,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    updateRemote: function(opts) {
+    updateRemote: async function(opts) {
         runtime.log.audit({event: "projects.remote.update",id:opts.id, remote:opts.remote.name}, opts.req);
         return runtime.storage.projects.updateRemote(opts.user, opts.id, opts.remote.name, opts.remote)
     },
@@ -467,7 +465,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    pull: function(opts) {
+    pull: async function(opts) {
         runtime.log.audit({event: "projects.pull",id:opts.id, remote: opts.remote, track:opts.track}, opts.req);
         return runtime.storage.projects.pull(opts.user, opts.id, opts.remote, opts.track, opts.allowUnrelatedHistories);
     },
@@ -483,7 +481,7 @@ var api = module.exports = {
     * @return {Promise<Object>} - resolves when complete
     * @memberof @node-red/runtime_projects
     */
-    push: function(opts) {
+    push: async function(opts) {
         runtime.log.audit({event: "projects.push",id:opts.id, remote: opts.remote, track:opts.track}, opts.req);
         return runtime.storage.projects.push(opts.user, opts.id, opts.remote, opts.track);
     }
diff --git a/packages/node_modules/@node-red/runtime/lib/api/settings.js b/packages/node_modules/@node-red/runtime/lib/api/settings.js
index 6ebeeccfb..d96ec5b58 100644
--- a/packages/node_modules/@node-red/runtime/lib/api/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/settings.js
@@ -64,64 +64,75 @@ var api = module.exports = {
     * @return {Promise<Object>} - the runtime settings
     * @memberof @node-red/runtime_settings
     */
-    getRuntimeSettings: function(opts) {
-        return new Promise(function(resolve,reject) {
-            try {
-                var safeSettings = {
-                    httpNodeRoot: runtime.settings.httpNodeRoot||"/",
-                    version: runtime.settings.version
-                }
-                if (opts.user) {
-                    safeSettings.user = {}
-                    var props = ["anonymous","username","image","permissions"];
-                    props.forEach(prop => {
-                        if (opts.user.hasOwnProperty(prop)) {
-                            safeSettings.user[prop] = opts.user[prop];
-                        }
-                    })
+    getRuntimeSettings: async function(opts) {
+        var safeSettings = {
+            httpNodeRoot: runtime.settings.httpNodeRoot||"/",
+            version: runtime.settings.version
+        }
+        if (opts.user) {
+            safeSettings.user = {}
+            var props = ["anonymous","username","image","permissions"];
+            props.forEach(prop => {
+                if (opts.user.hasOwnProperty(prop)) {
+                    safeSettings.user[prop] = opts.user[prop];
                 }
+            })
+        }
 
-                if (!runtime.settings.disableEditor) {
-                    safeSettings.context = runtime.nodes.listContextStores();
+        if (!runtime.settings.disableEditor) {
+            safeSettings.context = runtime.nodes.listContextStores();
 
-                    if (util.isArray(runtime.settings.paletteCategories)) {
-                        safeSettings.paletteCategories = runtime.settings.paletteCategories;
-                    }
-
-                    if (runtime.settings.flowFilePretty) {
-                        safeSettings.flowFilePretty = runtime.settings.flowFilePretty;
-                    }
-
-                    if (!runtime.nodes.paletteEditorEnabled()) {
-                        safeSettings.editorTheme = safeSettings.editorTheme || {};
-                        safeSettings.editorTheme.palette = safeSettings.editorTheme.palette || {};
-                        safeSettings.editorTheme.palette.editable = false;
-                    }
-                    if (runtime.storage.projects) {
-                        var activeProject = runtime.storage.projects.getActiveProject();
-                        if (activeProject) {
-                            safeSettings.project = activeProject;
-                        } else if (runtime.storage.projects.flowFileExists()) {
-                            safeSettings.files = {
-                                flow: runtime.storage.projects.getFlowFilename(),
-                                credentials: runtime.storage.projects.getCredentialsFilename()
-                            }
-                        }
-                        safeSettings.git = {
-                            globalUser: runtime.storage.projects.getGlobalGitUser()
-                        }
-                    }
-
-                    safeSettings.flowEncryptionType = runtime.nodes.getCredentialKeyType();
-                    runtime.settings.exportNodeSettings(safeSettings);
-                }
-
-
-                resolve(safeSettings);
-            }catch(err) {
-                console.log(err);
+            if (util.isArray(runtime.settings.paletteCategories)) {
+                safeSettings.paletteCategories = runtime.settings.paletteCategories;
             }
-        });
+
+            if (runtime.settings.flowFilePretty) {
+                safeSettings.flowFilePretty = runtime.settings.flowFilePretty;
+            }
+
+            if (runtime.settings.editorTheme && runtime.settings.editorTheme.palette) {
+                if (runtime.settings.editorTheme.palette.upload === false || runtime.settings.editorTheme.palette.editable === false) {
+                    safeSettings.externalModules = {palette: { } }
+                }
+                if (runtime.settings.editorTheme.palette.upload === false) {
+                    safeSettings.externalModules.palette.allowUpload = false;
+                }
+                if (runtime.settings.editorTheme.palette.editable === false) {
+                    safeSettings.externalModules.palette.allowInstall = false;
+                    safeSettings.externalModules.palette.allowUpload = false;
+                }
+            }
+
+            if (runtime.settings.externalModules) {
+                safeSettings.externalModules = extend(safeSettings.externalModules||{},runtime.settings.externalModules);
+            }
+
+            if (!runtime.nodes.installerEnabled()) {
+                safeSettings.externalModules = safeSettings.externalModules || {};
+                safeSettings.externalModules.palette = safeSettings.externalModules.palette || {};
+                safeSettings.externalModules.palette.allowInstall = false;
+                safeSettings.externalModules.palette.allowUpload = false;
+            }
+            if (runtime.storage.projects) {
+                var activeProject = runtime.storage.projects.getActiveProject();
+                if (activeProject) {
+                    safeSettings.project = activeProject;
+                } else if (runtime.storage.projects.flowFileExists()) {
+                    safeSettings.files = {
+                        flow: runtime.storage.projects.getFlowFilename(),
+                        credentials: runtime.storage.projects.getCredentialsFilename()
+                    }
+                }
+                safeSettings.git = {
+                    globalUser: runtime.storage.projects.getGlobalGitUser()
+                }
+            }
+
+            safeSettings.flowEncryptionType = runtime.nodes.getCredentialKeyType();
+            runtime.settings.exportNodeSettings(safeSettings);
+        }
+
+        return safeSettings;
     },
 
     /**
@@ -132,14 +143,14 @@ var api = module.exports = {
     * @return {Promise<Object>} - the user settings
     * @memberof @node-red/runtime_settings
     */
-    getUserSettings: function(opts) {
+    getUserSettings: async function(opts) {
         var username;
         if (!opts.user || opts.user.anonymous) {
             username = '_';
         } else {
             username = opts.user.username;
         }
-        return Promise.resolve(runtime.settings.getUserSettings(username)||{});
+        return runtime.settings.getUserSettings(username)||{};
     },
 
     /**
@@ -151,32 +162,30 @@ var api = module.exports = {
     * @return {Promise<Object>} - the user settings
     * @memberof @node-red/runtime_settings
     */
-    updateUserSettings: function(opts) {
+    updateUserSettings: async function(opts) {
         var username;
         if (!opts.user || opts.user.anonymous) {
             username = '_';
         } else {
             username = opts.user.username;
         }
-        return new Promise(function(resolve,reject) {
-            var currentSettings = runtime.settings.getUserSettings(username)||{};
-            currentSettings = extend(currentSettings, opts.settings);
-            try {
-                runtime.settings.setUserSettings(username, currentSettings).then(function() {
-                    runtime.log.audit({event: "settings.update",username:username}, opts.req);
-                    return resolve();
-                }).catch(function(err) {
-                    runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
-                    err.status = 400;
-                    return reject(err);
-                });
-            } catch(err) {
-                runtime.log.warn(runtime.log._("settings.user-not-available",{message:runtime.log._("settings.not-available")}));
+        var currentSettings = runtime.settings.getUserSettings(username)||{};
+        currentSettings = extend(currentSettings, opts.settings);
+        try {
+            return runtime.settings.setUserSettings(username, currentSettings).then(function() {
+                runtime.log.audit({event: "settings.update",username:username}, opts.req);
+                return;
+            }).catch(function(err) {
                 runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
                 err.status = 400;
-                return reject(err);
-            }
-        });
+                throw err;
+            });
+        } catch(err) {
+            runtime.log.warn(runtime.log._("settings.user-not-available",{message:runtime.log._("settings.not-available")}));
+            runtime.log.audit({event: "settings.update",username:username,error:err.code||"unexpected_error",message:err.toString()}, opts.req);
+            err.status = 400;
+            throw err;
+        }
     },
 
     /**
@@ -187,15 +196,12 @@ var api = module.exports = {
     * @return {Promise<Object>} - the user's ssh keys
     * @memberof @node-red/runtime_settings
     */
-    getUserKeys: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var username = getSSHKeyUsername(opts.user);
-            runtime.storage.projects.ssh.listSSHKeys(username).then(function(list) {
-                return resolve(list);
-            }).catch(function(err) {
-                err.status = 400;
-                return reject(err);
-            });
+    getUserKeys: async function(opts) {
+        var username = getSSHKeyUsername(opts.user);
+        return runtime.storage.projects.ssh.listSSHKeys(username).catch(function(err) {
+            err.status = 400;
+            throw err;
+            return reject(err);
         });
     },
 
@@ -208,23 +214,23 @@ var api = module.exports = {
     * @return {Promise<String>} - the user's ssh public key
     * @memberof @node-red/runtime_settings
     */
-    getUserKey: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var username = getSSHKeyUsername(opts.user);
-            // console.log('username:', username);
-            runtime.storage.projects.ssh.getSSHKey(username, opts.id).then(function(data) {
-                if (data) {
-                    return resolve(data);
-                } else {
-                    var err = new Error("Key not found");
-                    err.code = "not_found";
-                    err.status = 404;
-                    return reject(err);
-                }
-            }).catch(function(err) {
+    getUserKey: async function(opts) {
+        var username = getSSHKeyUsername(opts.user);
+        // console.log('username:', username);
+        return runtime.storage.projects.ssh.getSSHKey(username, opts.id).then(function(data) {
+            if (data) {
+                return data;
+            } else {
+                var err = new Error("Key not found");
+                err.code = "not_found";
+                err.status = 404;
+                throw err;
+            }
+        }).catch(function(err) {
+            if (!err.status) {
                 err.status = 400;
-                return reject(err);
-            });
+            }
+            throw err;
         });
     },
 
@@ -240,15 +246,11 @@ var api = module.exports = {
     * @return {Promise<String>} - the id of the generated key
     * @memberof @node-red/runtime_settings
     */
-    generateUserKey: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var username = getSSHKeyUsername(opts.user);
-            runtime.storage.projects.ssh.generateSSHKey(username, opts).then(function(name) {
-                return resolve(name);
-            }).catch(function(err) {
-                err.status = 400;
-                return reject(err);
-            });
+    generateUserKey: async function(opts) {
+        var username = getSSHKeyUsername(opts.user);
+        return runtime.storage.projects.ssh.generateSSHKey(username, opts).catch(function(err) {
+            err.status = 400;
+            throw err;
         });
     },
 
@@ -261,16 +263,11 @@ var api = module.exports = {
     * @return {Promise} - resolves when deleted
     * @memberof @node-red/runtime_settings
     */
-    removeUserKey: function(opts) {
-        return new Promise(function(resolve,reject) {
-            var username = getSSHKeyUsername(opts.user);
-            runtime.storage.projects.ssh.deleteSSHKey(username, opts.id).then(function() {
-                return resolve();
-            }).catch(function(err) {
-                err.status = 400;
-                return reject(err);
-            });
+    removeUserKey: async function(opts) {
+        var username = getSSHKeyUsername(opts.user);
+        return runtime.storage.projects.ssh.deleteSSHKey(username, opts.id).catch(function(err) {
+            err.status = 400;
+            throw err;
         });
-
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
index a7e00bfbc..bd782256c 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -16,8 +16,8 @@
 
 var clone = require("clone");
 var redUtil = require("@node-red/util").util;
+const events = require("@node-red/util").events;
 var flowUtil = require("./util");
-var events = require("../events");
 const context = require('../nodes/context');
 const hooks = require("../hooks");
 
@@ -93,7 +93,7 @@ class Flow {
      * @param  {[type]} msg [description]
      * @return {[type]}     [description]
      */
-    log(msg) {
+    info(msg) {
         Log.log({
             id: this.id||"global",
             level: Log.INFO,
@@ -116,6 +116,17 @@ class Flow {
         })
     }
 
+    /**
+     * [log description]
+     * @param  {[type]} msg [description]
+     * @return {[type]}     [description]
+     */
+    log(msg) {
+        if (!msg.path) {
+            msg.path = this.path;
+        }
+        this.parent.log(msg);
+    }
 
     /**
      * Start this flow.
@@ -303,21 +314,13 @@ class Flow {
             if (node) {
                 delete this.activeNodes[stopList[i]];
                 if (this.subflowInstanceNodes[stopList[i]]) {
-                    try {
-                        (function(subflow) {
-                            promises.push(stopNode(node,false).then(() => subflow.stop()));
-                        })(this.subflowInstanceNodes[stopList[i]]);
-                    } catch(err) {
-                        node.error(err);
-                    }
                     delete this.subflowInstanceNodes[stopList[i]];
-                } else {
-                    try {
-                        var removed = removedMap[stopList[i]];
-                        promises.push(stopNode(node,removed).catch(()=>{}));
-                    } catch(err) {
-                        node.error(err);
-                    }
+                }
+                try {
+                    var removed = removedMap[stopList[i]];
+                    promises.push(stopNode(node,removed).catch(()=>{}));
+                } catch(err) {
+                    node.error(err);
                 }
                 if (removedMap[stopList[i]]) {
                     events.emit("node-status",{
@@ -470,8 +473,8 @@ class Flow {
         }
         // console.log("HE",logMessage);
         var count = 1;
-        if (msg && msg.hasOwnProperty("error") && msg.error !== null) {
-            if (msg.error.hasOwnProperty("source") && msg.error.source !== null) {
+        if (msg && msg.hasOwnProperty("error") && msg.error) {
+            if (msg.error.hasOwnProperty("source") && msg.error.source) {
                 if (msg.error.source.id === node.id) {
                     count = msg.error.source.count+1;
                     if (count === 10) {
@@ -679,7 +682,6 @@ module.exports = {
         asyncMessageDelivery = !runtime.settings.runtimeSyncDelivery
         Log = runtime.log;
         Subflow = require("./Subflow");
-        Subflow.init(runtime);
     },
     create: function(parent,global,conf) {
         return new Flow(parent,global,conf);
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
index 78ec9ee75..3344d65d3 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
@@ -18,16 +18,11 @@ const clone = require("clone");
 const Flow = require('./Flow').Flow;
 const context = require('../nodes/context');
 const util = require("util");
-const events = require("../events");
-
 const redUtil = require("@node-red/util").util;
+const events = require("@node-red/util").events;
 const flowUtil = require("./util");
-
-
 const credentials = require("../nodes/credentials");
 
-var Log;
-
 /**
  * Create deep copy of object
  */
@@ -117,8 +112,8 @@ class Subflow extends Flow {
         this.node_map = node_map;
         this.path = parent.path+"/"+(subflowInstance._alias||subflowInstance.id);
 
-        this.templateCredentials = credentials.get(subflowDef.id);
-        this.instanceCredentials = credentials.get(this.id);
+        this.templateCredentials = credentials.get(subflowDef.id) || {};
+        this.instanceCredentials = credentials.get(this.id) || {};
 
         var env = [];
         if (this.subflowDef.env) {
@@ -213,7 +208,12 @@ class Subflow extends Flow {
 
         this.node = new Node(subflowInstanceConfig);
         this.node.on("input", function(msg) { this.send(msg);});
-        this.node.on("close", function() { this.status({}); })
+        // Called when the subflow instance node is being stopped
+        this.node.on("close", function(done) {
+            this.status({});
+            // Stop the complete subflow
+            self.stop().finally(done)
+        })
         this.node.status = status => this.parent.handleStatus(this.node,status);
         // Create a context instance
         // console.log("Node.context",this.type,"id:",this._alias||this.id,"z:",this.z)
@@ -504,13 +504,49 @@ function remapSubflowNodes(nodes,nodeMap) {
     }
 }
 
+class SubflowModule extends Subflow {
+    /**
+     * Create a Subflow Module object.
+     * This is a node that has been published as a subflow.
+     * @param {[type]} parent          [description]
+     * @param {[type]} globalFlow      [description]
+     * @param {[type]} subflowDef      [description]
+     * @param {[type]} subflowInstance [description]
+     */
+    constructor(type, parent,globalFlow,subflowDef,subflowInstance) {
+        super(parent,globalFlow,subflowDef,subflowInstance);
+        this.TYPE = `module:${type}`;
+        this.subflowType = type;
+    }
+
+    /**
+     * [log description]
+     * @param  {[type]} msg [description]
+     * @return {[type]}     [description]
+     */
+    log(msg) {
+        if (msg.id) {
+            msg.id = this.id
+        }
+        if (msg.type) {
+            msg.type = this.subflowType
+        }
+        super.log(msg);
+    }
+
+}
+
 function createSubflow(parent,globalFlow,subflowDef,subflowInstance) {
     return new Subflow(parent,globalFlow,subflowDef,subflowInstance)
 }
 
-module.exports = {
-    init: function(runtime) {
-        Log = runtime.log;
-    },
-    create: createSubflow
+
+function createModuleInstance(type, parent,globalFlow,subflowDef,subflowInstance) {
+    return new SubflowModule(type, parent,globalFlow,subflowDef,subflowInstance);
+}
+
+module.exports = {
+    init: function(runtime) {},
+    create: createSubflow,
+    createModuleInstance: createModuleInstance
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/index.js b/packages/node_modules/@node-red/runtime/lib/flows/index.js
index a207b8f05..b31dc7755 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/index.js
@@ -25,9 +25,8 @@ var context = require("../nodes/context")
 var credentials = require("../nodes/credentials");
 var flowUtil = require("./util");
 var log;
-var events = require("../events");
+const events = require("@node-red/util").events;
 var redUtil = require("@node-red/util").util;
-const hooks = require("../hooks");
 
 var storage = null;
 var settings = null;
@@ -699,7 +698,8 @@ const flowAPI = {
     getNode: getNode,
     handleError: () => false,
     handleStatus: () => false,
-    getSetting: k => flowUtil.getEnvVar(k)
+    getSetting: k => flowUtil.getEnvVar(k),
+    log: m => log.log(m)
 }
 
 
@@ -712,7 +712,7 @@ module.exports = {
      */
     load: load,
     loadFlows: load,
-    
+
     get:getNode,
     eachNode: eachNode,
 
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/util.js b/packages/node_modules/@node-red/runtime/lib/flows/util.js
index d5a8cba9f..edb348ac4 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/util.js
@@ -19,6 +19,7 @@ var Log = require("@node-red/util").log;
 var subflowInstanceRE = /^subflow:(.+)$/;
 var typeRegistry = require("@node-red/registry");
 
+
 var envVarExcludes = {};
 
 function diffNodes(oldNode,newNode) {
@@ -66,6 +67,195 @@ function mapEnvVarProperties(obj,prop,flow) {
     }
 }
 
+
+function createNode(flow,config) {
+    var newNode = null;
+    var type = config.type;
+    try {
+        var nodeTypeConstructor = typeRegistry.get(type);
+        if (typeof nodeTypeConstructor === "function") {
+            var conf = clone(config);
+            delete conf.credentials;
+            for (var p in conf) {
+                if (conf.hasOwnProperty(p)) {
+                    mapEnvVarProperties(conf,p,flow);
+                }
+            }
+            try {
+                Object.defineProperty(conf,'_flow', {value: flow, enumerable: false, writable: true })
+                newNode = new nodeTypeConstructor(conf);
+            } catch (err) {
+                Log.log({
+                    level: Log.ERROR,
+                    id:conf.id,
+                    type: type,
+                    msg: err
+                });
+            }
+        } else if (nodeTypeConstructor) {
+            // console.log(nodeTypeConstructor)
+            var subflowConfig = parseConfig([nodeTypeConstructor.subflow].concat(nodeTypeConstructor.subflow.flow));
+            var instanceConfig = clone(config);
+            instanceConfig.env = clone(nodeTypeConstructor.subflow.env);
+
+            instanceConfig.env = nodeTypeConstructor.subflow.env.map(nodeProp => {
+                var nodePropType;
+                var nodePropValue = config[nodeProp.name];
+                if (nodeProp.type === "cred") {
+                    nodePropType = "cred";
+                } else {
+                    switch(typeof config[nodeProp.name]) {
+                        case "string": nodePropType = "str"; break;
+                        case "number": nodePropType = "num"; break;
+                        case "boolean": nodePropType = "bool"; nodePropValue = nodeProp?"true":"false"; break;
+                        default:
+                            nodePropType = config[nodeProp.name].type;
+                            nodePropValue = config[nodeProp.name].value;
+                    }
+                }
+                return {
+                    name: nodeProp.name,
+                    type: nodePropType,
+                    value: nodePropValue
+                }
+            })
+
+            var subflow = require("./Subflow").createModuleInstance(
+                nodeTypeConstructor.type,
+                flow,
+                flow.global,
+                subflowConfig.subflows[nodeTypeConstructor.subflow.id],
+                instanceConfig
+            );
+            subflow.start();
+            return subflow.node;
+
+            Log.error(Log._("nodes.flow.unknown-type", {type:type}));
+        }
+    } catch(err) {
+        Log.error(err);
+    }
+    return newNode;
+}
+
+function parseConfig(config) {
+   var flow = {};
+   flow.allNodes = {};
+   flow.subflows = {};
+   flow.configs = {};
+   flow.flows = {};
+   flow.groups = {};
+   flow.missingTypes = [];
+
+   config.forEach(function(n) {
+       flow.allNodes[n.id] = clone(n);
+       if (n.type === 'tab') {
+           flow.flows[n.id] = n;
+           flow.flows[n.id].subflows = {};
+           flow.flows[n.id].configs = {};
+           flow.flows[n.id].nodes = {};
+       }
+       if (n.type === 'group') {
+           flow.groups[n.id] = n;
+       }
+   });
+
+   // TODO: why a separate forEach? this can be merged with above
+   config.forEach(function(n) {
+       if (n.type === 'subflow') {
+           flow.subflows[n.id] = n;
+           flow.subflows[n.id].configs = {};
+           flow.subflows[n.id].nodes = {};
+           flow.subflows[n.id].instances = [];
+       }
+   });
+   var linkWires = {};
+   var linkOutNodes = [];
+   config.forEach(function(n) {
+       if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
+           var subflowDetails = subflowInstanceRE.exec(n.type);
+
+           if ( (subflowDetails && !flow.subflows[subflowDetails[1]]) || (!subflowDetails && !typeRegistry.get(n.type)) ) {
+               if (flow.missingTypes.indexOf(n.type) === -1) {
+                   flow.missingTypes.push(n.type);
+               }
+           }
+           var container = null;
+           if (flow.flows[n.z]) {
+               container = flow.flows[n.z];
+           } else if (flow.subflows[n.z]) {
+               container = flow.subflows[n.z];
+           }
+           if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
+               if (subflowDetails) {
+                   var subflowType = subflowDetails[1]
+                   n.subflow = subflowType;
+                   flow.subflows[subflowType].instances.push(n)
+               }
+               if (container) {
+                   container.nodes[n.id] = n;
+               }
+           } else {
+               if (container) {
+                   container.configs[n.id] = n;
+               } else {
+                   flow.configs[n.id] = n;
+                   flow.configs[n.id]._users = [];
+               }
+           }
+           if (n.type === 'link in' && n.links) {
+               // Ensure wires are present in corresponding link out nodes
+               n.links.forEach(function(id) {
+                   linkWires[id] = linkWires[id]||{};
+                   linkWires[id][n.id] = true;
+               })
+           } else if (n.type === 'link out' && n.links) {
+               linkWires[n.id] = linkWires[n.id]||{};
+               n.links.forEach(function(id) {
+                   linkWires[n.id][id] = true;
+               })
+               linkOutNodes.push(n);
+           }
+       }
+   });
+   linkOutNodes.forEach(function(n) {
+       var links = linkWires[n.id];
+       var targets = Object.keys(links);
+       n.wires = [targets];
+   });
+
+
+   var addedTabs = {};
+   config.forEach(function(n) {
+       if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
+           for (var prop in n) {
+               if (n.hasOwnProperty(prop) && prop !== 'id' && prop !== 'wires' && prop !== 'type' && prop !== '_users' && flow.configs.hasOwnProperty(n[prop])) {
+                   // This property references a global config node
+                   flow.configs[n[prop]]._users.push(n.id)
+               }
+           }
+           if (n.z && !flow.subflows[n.z]) {
+
+               if (!flow.flows[n.z]) {
+                   flow.flows[n.z] = {type:'tab',id:n.z};
+                   flow.flows[n.z].subflows = {};
+                   flow.flows[n.z].configs = {};
+                   flow.flows[n.z].nodes = {};
+                   addedTabs[n.z] = flow.flows[n.z];
+               }
+               if (addedTabs[n.z]) {
+                   if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
+                       addedTabs[n.z].nodes[n.id] = n;
+                   } else {
+                       addedTabs[n.z].configs[n.id] = n;
+                   }
+               }
+           }
+       }
+   });
+   return flow;
+}
+
 module.exports = {
     init: function(runtime) {
         envVarExcludes = {};
@@ -79,123 +269,7 @@ module.exports = {
     diffNodes: diffNodes,
     mapEnvVarProperties: mapEnvVarProperties,
 
-    parseConfig: function(config) {
-        var flow = {};
-        flow.allNodes = {};
-        flow.subflows = {};
-        flow.configs = {};
-        flow.flows = {};
-        flow.groups = {};
-        flow.missingTypes = [];
-
-        config.forEach(function(n) {
-            flow.allNodes[n.id] = clone(n);
-            if (n.type === 'tab') {
-                flow.flows[n.id] = n;
-                flow.flows[n.id].subflows = {};
-                flow.flows[n.id].configs = {};
-                flow.flows[n.id].nodes = {};
-            }
-            if (n.type === 'group') {
-                flow.groups[n.id] = n;
-            }
-        });
-
-        // TODO: why a separate forEach? this can be merged with above
-        config.forEach(function(n) {
-            if (n.type === 'subflow') {
-                flow.subflows[n.id] = n;
-                flow.subflows[n.id].configs = {};
-                flow.subflows[n.id].nodes = {};
-                flow.subflows[n.id].instances = [];
-            }
-        });
-        var linkWires = {};
-        var linkOutNodes = [];
-        config.forEach(function(n) {
-            if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
-                var subflowDetails = subflowInstanceRE.exec(n.type);
-
-                if ( (subflowDetails && !flow.subflows[subflowDetails[1]]) || (!subflowDetails && !typeRegistry.get(n.type)) ) {
-                    if (flow.missingTypes.indexOf(n.type) === -1) {
-                        flow.missingTypes.push(n.type);
-                    }
-                }
-                var container = null;
-                if (flow.flows[n.z]) {
-                    container = flow.flows[n.z];
-                } else if (flow.subflows[n.z]) {
-                    container = flow.subflows[n.z];
-                }
-                if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
-                    if (subflowDetails) {
-                        var subflowType = subflowDetails[1]
-                        n.subflow = subflowType;
-                        flow.subflows[subflowType].instances.push(n)
-                    }
-                    if (container) {
-                        container.nodes[n.id] = n;
-                    }
-                } else {
-                    if (container) {
-                        container.configs[n.id] = n;
-                    } else {
-                        flow.configs[n.id] = n;
-                        flow.configs[n.id]._users = [];
-                    }
-                }
-                if (n.type === 'link in' && n.links) {
-                    // Ensure wires are present in corresponding link out nodes
-                    n.links.forEach(function(id) {
-                        linkWires[id] = linkWires[id]||{};
-                        linkWires[id][n.id] = true;
-                    })
-                } else if (n.type === 'link out' && n.links) {
-                    linkWires[n.id] = linkWires[n.id]||{};
-                    n.links.forEach(function(id) {
-                        linkWires[n.id][id] = true;
-                    })
-                    linkOutNodes.push(n);
-                }
-            }
-        });
-        linkOutNodes.forEach(function(n) {
-            var links = linkWires[n.id];
-            var targets = Object.keys(links);
-            n.wires = [targets];
-        });
-
-
-        var addedTabs = {};
-        config.forEach(function(n) {
-            if (n.type !== 'subflow' && n.type !== 'tab' && n.type !== 'group') {
-                for (var prop in n) {
-                    if (n.hasOwnProperty(prop) && prop !== 'id' && prop !== 'wires' && prop !== 'type' && prop !== '_users' && flow.configs.hasOwnProperty(n[prop])) {
-                        // This property references a global config node
-                        flow.configs[n[prop]]._users.push(n.id)
-                    }
-                }
-                if (n.z && !flow.subflows[n.z]) {
-
-                    if (!flow.flows[n.z]) {
-                        flow.flows[n.z] = {type:'tab',id:n.z};
-                        flow.flows[n.z].subflows = {};
-                        flow.flows[n.z].configs = {};
-                        flow.flows[n.z].nodes = {};
-                        addedTabs[n.z] = flow.flows[n.z];
-                    }
-                    if (addedTabs[n.z]) {
-                        if (n.hasOwnProperty('x') && n.hasOwnProperty('y')) {
-                            addedTabs[n.z].nodes[n.id] = n;
-                        } else {
-                            addedTabs[n.z].configs[n.id] = n;
-                        }
-                    }
-                }
-            }
-        });
-        return flow;
-    },
+    parseConfig: parseConfig,
 
     diffConfigs: function(oldConfig, newConfig) {
         var id;
@@ -368,8 +442,21 @@ module.exports = {
                             // This node has a property that references a changed/removed node
                             // Assume it is a config node change and mark this node as
                             // changed.
-                            if (changed[node[prop]] || removed[node[prop]]) {
+
+                            var changeOrigin = changed[node[prop]];
+                            if (changeOrigin || removed[node[prop]]) {
                                 if (!changed[node.id]) {
+                                    if (changeOrigin &&
+                                        (prop === "g") &&
+                                        (changeOrigin.type === "group")) {
+                                        var oldNode = oldConfig.allNodes[node.id];
+                                        // ignore change of group node
+                                        // if group of this node not changed
+                                        if (oldNode &&
+                                            (node.g === oldNode.g)) {
+                                            continue;
+                                        }
+                                    }
                                     madeChange = true;
                                     changed[node.id] = node;
                                     // This node exists within subflow template
@@ -475,36 +562,5 @@ module.exports = {
      * @param  {object} config The node configuration object
      * @return {Node}          The instance of the node
      */
-    createNode: function(flow,config) {
-        var newNode = null;
-        var type = config.type;
-        try {
-            var nodeTypeConstructor = typeRegistry.get(type);
-            if (nodeTypeConstructor) {
-                var conf = clone(config);
-                delete conf.credentials;
-                for (var p in conf) {
-                    if (conf.hasOwnProperty(p)) {
-                        mapEnvVarProperties(conf,p,flow);
-                    }
-                }
-                try {
-                    Object.defineProperty(conf,'_flow', {value: flow, enumerable: false, writable: true })
-                    newNode = new nodeTypeConstructor(conf);
-                } catch (err) {
-                    Log.log({
-                        level: Log.ERROR,
-                        id:conf.id,
-                        type: type,
-                        msg: err
-                    });
-                }
-            } else {
-                Log.error(Log._("nodes.flow.unknown-type", {type:type}));
-            }
-        } catch(err) {
-            Log.error(err);
-        }
-        return newNode;
-    }
+    createNode: createNode
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js
index f9a772ea3..0be1c6511 100644
--- a/packages/node_modules/@node-red/runtime/lib/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/index.js
@@ -14,27 +14,22 @@
  * limitations under the License.
  **/
 
-var when = require('when');
-
 var externalAPI = require("./api");
 
 var redNodes = require("./nodes");
 var flows = require("./flows");
 var storage = require("./storage");
 var library = require("./library");
-var events = require("./events");
 var hooks = require("./hooks");
+var plugins = require("./plugins");
 var settings = require("./settings");
-var exec = require("./exec");
 
 var express = require("express");
 var path = require('path');
 var fs = require("fs");
 var os = require("os");
 
-var redUtil = require("@node-red/util");
-var log = redUtil.log;
-var i18n = redUtil.i18n;
+const {log,i18n,events,exec,util} = require("@node-red/util");
 
 var runtimeMetricInterval = null;
 
@@ -67,7 +62,7 @@ var server;
  *                              better abstracted.
  * @memberof @node-red/runtime
  */
-function init(userSettings,httpServer,_adminApi,__util) {
+function init(userSettings,httpServer,_adminApi) {
     server = httpServer;
     userSettings.version = getVersion();
     settings.init(userSettings);
@@ -81,14 +76,6 @@ function init(userSettings,httpServer,_adminApi,__util) {
     redNodes.init(runtime);
     library.init(runtime);
     externalAPI.init(runtime);
-    exec.init(runtime);
-    if (__util) {
-        log = __util.log;
-        i18n = __util.i18n;
-    } else {
-        log = redUtil.log;
-        i18n = redUtil.i18n;
-    }
 }
 
 var version;
@@ -137,7 +124,15 @@ function start() {
             }
             log.info(os.type()+" "+os.release()+" "+os.arch()+" "+os.endianness());
             return redNodes.load().then(function() {
-
+                let autoInstallModules = false;
+                if (settings.hasOwnProperty('autoInstallModules')) {
+                    log.warn(log._("server.deprecatedOption",{old:"autoInstallModules", new:"externalModules.autoInstall"}));
+                    autoInstallModules = true;
+                }
+                if (settings.externalModules) {
+                    // autoInstallModules = autoInstall enabled && (no palette setting || palette install not disabled)
+                    autoInstallModules = settings.externalModules.autoInstall && (!settings.externalModules.palette || settings.externalModules.palette.allowInstall !== false) ;
+                }
                 var i;
                 var nodeErrors = redNodes.getNodeList(function(n) { return n.err!=null;});
                 var nodeMissing = redNodes.getNodeList(function(n) { return n.module && n.enabled && !n.loaded && !n.err;});
@@ -170,12 +165,12 @@ function start() {
                     for (i in missingModules) {
                         if (missingModules.hasOwnProperty(i)) {
                             log.warn(" - "+i+" ("+missingModules[i].version+"): "+missingModules[i].types.join(", "));
-                            if (settings.autoInstallModules && i != "node-red") {
+                            if (autoInstallModules && i != "node-red") {
                                 installingModules.push({id:i,version:missingModules[i].version});
                             }
                         }
                     }
-                    if (!settings.autoInstallModules) {
+                    if (!autoInstallModules) {
                         log.info(log._("server.removing-modules"));
                         redNodes.cleanModuleList();
                     } else if (installingModules.length > 0) {
@@ -197,29 +192,35 @@ function start() {
         });
 }
 
-var reinstallAttempts;
+var reinstallAttempts = 0;
 var reinstallTimeout;
 function reinstallModules(moduleList) {
-    var promises = [];
-    var failedModules = [];
+    const promises = [];
+    const reinstallList = [];
+    const installRetry = 30000;
+    if (settings.hasOwnProperty('autoInstallModulesRetry')) {
+        log.warn(log._("server.deprecatedOption",{old:"autoInstallModulesRetry", new:"externalModules.autoInstallRetry"}));
+        installRetry = settings.autoInstallModulesRetry;
+    }
+    if (settings.externalModules && settings.externalModules.hasOwnProperty('autoInstallRetry')) {
+        installRetry = settings.externalModules.autoInstallRetry * 1000;
+    }
     for (var i=0;i<moduleList.length;i++) {
-        if (settings.autoInstallModules && i != "node-red") {
-            promises.push(redNodes.installModule(moduleList[i].id,moduleList[i].version));
+        if (moduleList[i].id != "node-red") {
+            (function(mod) {
+                promises.push(redNodes.installModule(mod.id,mod.version).then(m => {
+                    events.emit("runtime-event",{id:"node/added",retain:false,payload:m.nodes});
+                }).catch(err => {
+                    reinstallList.push(mod);
+                }));
+            })(moduleList[i])
         }
     }
-    when.settle(promises).then(function(results) {
-        var reinstallList = [];
-        for (var i=0;i<results.length;i++) {
-            if (results[i].state === 'rejected') {
-                reinstallList.push(moduleList[i]);
-            } else {
-                events.emit("runtime-event",{id:"node/added",retain:false,payload:results[i].value.nodes});
-            }
-        }
+    Promise.all(promises).then(function(results) {
         if (reinstallList.length > 0) {
             reinstallAttempts++;
             // First 5 at 1x timeout, next 5 at 2x, next 5 at 4x, then 8x
-            var timeout = (settings.autoInstallModulesRetry||30000) * Math.pow(2,Math.min(Math.floor(reinstallAttempts/5),3));
+            var timeout = installRetry * Math.pow(2,Math.min(Math.floor(reinstallAttempts/5),3));
             reinstallTimeout = setTimeout(function() {
                 reinstallModules(reinstallList);
             },timeout);
@@ -249,6 +250,10 @@ function reportMetrics() {
 
 /**
  * Stops the runtime.
+ *
+ * Once called, Node-RED should not be restarted until the Node.JS process is
+ * restarted.
+ *
  * @return {Promise} - resolves when the runtime is stopped.
  * @memberof @node-red/runtime
  */
@@ -269,17 +274,18 @@ function stop() {
 // This is the internal api
 var runtime = {
     version: getVersion,
-    get log() { return log },
-    get i18n() { return i18n },
+    log: log,
+    i18n: i18n,
+    events: events,
     settings: settings,
     storage: storage,
-    events: events,
     hooks: hooks,
     nodes: redNodes,
+    plugins: plugins,
     flows: flows,
     library: library,
     exec: exec,
-    util: require("@node-red/util").util,
+    util: util,
     get adminApi() { return adminApi },
     get adminApp() { return adminApp },
     get nodeApp() { return nodeApp },
@@ -337,6 +343,12 @@ module.exports = {
     */
     context: externalAPI.context,
 
+    /**
+    * @memberof @node-red/runtime
+    * @mixes @node-red/runtime_plugins
+    */
+    plugins: externalAPI.plugins,
+
     /**
     * Returns whether the runtime is started
     * @param {Object} opts
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
index dfc8b5ed1..faf07bda5 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -486,16 +486,14 @@ function log_helper(self, level, msg) {
     if (self._alias) {
         o._alias = self._alias;
     }
-    if (self._flow) {
-        o.path = self._flow.path;
-    }
+
     if (self.z) {
         o.z = self.z;
     }
     if (self.name) {
         o.name = self.name;
     }
-    Log.log(o);
+    self._flow.log(o);
 }
 /**
  * Log an INFO level message
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
index 153ef4b06..86ea1d3a1 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var crypto = require('crypto');
 var runtime;
 var settings;
@@ -60,7 +59,7 @@ var api = module.exports = {
     /**
      * Sets the credentials from storage.
      */
-    load: function (credentials) {
+    load: async function (credentials) {
         dirty = false;
         var credentialsEncrypted = credentials.hasOwnProperty("$") && Object.keys(credentials).length === 1;
 
@@ -77,7 +76,7 @@ var api = module.exports = {
         // Case 4: credentialSecret set
         //  - use it
 
-        var setupEncryptionPromise = when.resolve();
+        var setupEncryptionPromise = Promise.resolve();
 
         var projectKey = false;
         var activeProject;
@@ -134,7 +133,7 @@ var api = module.exports = {
                             log.warn(log._("nodes.credentials.error",{message:err.toString()}))
                             var error = new Error("Failed to decrypt credentials");
                             error.code = "credentials_load_failed";
-                            return when.reject(error);
+                            throw error;
                         }
                     }
                     dirty = true;
@@ -163,7 +162,7 @@ var api = module.exports = {
                             log.warn(log._("nodes.credentials.error",{message:err.toString()}))
                             var error = new Error("Failed to decrypt credentials");
                             error.code = "credentials_load_failed";
-                            return when.reject(error);
+                            throw error;
                         }
                     }
                     dirty = true;
@@ -217,9 +216,9 @@ var api = module.exports = {
                         // This is a project with a bad key. Mark it as invalid
                         // TODO: this delves too deep into Project structure
                         activeProject.credentialSecretInvalid = true;
-                        return when.reject(error);
+                        throw error;
                     }
-                    return when.reject(error);
+                    throw error;
                 }
                 // These are encrypted credentials
                 try {
@@ -235,9 +234,9 @@ var api = module.exports = {
                         // This is a project with a bad key. Mark it as invalid
                         // TODO: this delves too deep into Project structure
                         activeProject.credentialSecretInvalid = true;
-                        return when.reject(error);
+                        throw error;
                     }
-                    return when.reject(error);
+                    throw error;
                 }
             } else {
                 credentialCache = credentials;
@@ -257,12 +256,11 @@ var api = module.exports = {
      * @param creds an object of credential key/value pairs
      * @return a promise for backwards compatibility TODO: can this be removed?
      */
-    add: function (id, creds) {
+    add: async function (id, creds) {
         if (!credentialCache.hasOwnProperty(id) || JSON.stringify(creds) !== JSON.stringify(credentialCache[id])) {
             credentialCache[id] = creds;
             dirty = true;
         }
-        return when.resolve();
     },
 
     /**
@@ -293,7 +291,7 @@ var api = module.exports = {
      * @param config a flow config
      * @return a promise for the saving of credentials to storage
      */
-    clean: function (config) {
+    clean: async function (config) {
         var existingIds = {};
         config.forEach(function(n) {
             existingIds[n.id] = true;
@@ -313,7 +311,6 @@ var api = module.exports = {
         if (deletedCredentials) {
             dirty = true;
         }
-        return when.resolve();
     },
 
     /**
@@ -432,7 +429,7 @@ var api = module.exports = {
     getKeyType: function() {
         return encryptionKeyType;
     },
-    export: function() {
+    export: async function() {
         var result = credentialCache;
 
         if (encryptionEnabled) {
@@ -455,7 +452,7 @@ var api = module.exports = {
                 return result;
             })
         } else {
-            return when.resolve(result);
+            return result;
         }
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/index.js b/packages/node_modules/@node-red/runtime/lib/nodes/index.js
index 42fcd72f6..73e7baee8 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/index.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var path = require("path");
 var fs = require("fs");
 var clone = require("clone");
@@ -29,7 +28,7 @@ var context = require("./context");
 var Node = require("./Node");
 var log;
 
-var events = require("../events");
+const events = require("@node-red/util").events;
 
 var settings;
 
@@ -113,6 +112,25 @@ function createNode(node,def) {
     }
 }
 
+function registerSubflow(nodeSet, subflow) {
+    // TODO: extract credentials definition from subflow properties
+    var registeredType = registry.registerSubflow(nodeSet,subflow);
+
+    if (subflow.env) {
+        var creds = {};
+        var hasCreds = false;
+        subflow.env.forEach(e => {
+            if (e.type === "cred") {
+                creds[e.name] = {type: "password"};
+                hasCreds = true;
+            }
+        })
+        if (hasCreds) {
+            credentials.register(registeredType.type,creds);
+        }
+    }
+}
+
 function init(runtime) {
     settings = runtime.settings;
     log = runtime.log;
@@ -163,11 +181,12 @@ function installModule(module,version,url) {
 
 function uninstallModule(module) {
     var info = registry.getModuleInfo(module);
-    if (!info) {
+    if (!info || !info.user) {
         throw new Error(log._("nodes.index.unrecognised-module", {module:module}));
     } else {
-        for (var i=0;i<info.nodes.length;i++) {
-            flows.checkTypeInUse(module+"/"+info.nodes[i].name);
+        var nodeTypesToCheck = info.nodes.map(n => `${module}/${n.name}`);
+        for (var i=0;i<nodeTypesToCheck.length;i++) {
+            flows.checkTypeInUse(nodeTypesToCheck[i]);
         }
         return registry.uninstallModule(module).then(function(list) {
             events.emit("runtime-event",{id:"node/removed",retain:false,payload:list});
@@ -188,7 +207,7 @@ module.exports = {
     getContext: context.get,
 
 
-    paletteEditorEnabled: registry.paletteEditorEnabled,
+    installerEnabled: registry.installerEnabled,
     installModule: installModule,
     uninstallModule: uninstallModule,
 
@@ -197,6 +216,7 @@ module.exports = {
 
     // Node type registry
     registerType: registerType,
+    registerSubflow: registerSubflow,
     getType: registry.get,
 
     getNodeInfo: registry.getNodeInfo,
diff --git a/packages/node_modules/@node-red/runtime/lib/plugins.js b/packages/node_modules/@node-red/runtime/lib/plugins.js
new file mode 100644
index 000000000..738a64fa7
--- /dev/null
+++ b/packages/node_modules/@node-red/runtime/lib/plugins.js
@@ -0,0 +1,10 @@
+const registry = require("@node-red/registry");
+
+module.exports = {
+    init: function() {},
+    registerPlugin: registry.registerPlugin,
+    getPlugin: registry.getPlugin,
+    getPluginsByType: registry.getPluginsByType,
+    getPluginList: registry.getPluginList,
+    getPluginConfigs: registry.getPluginConfigs,
+}
\ No newline at end of file
diff --git a/packages/node_modules/@node-red/runtime/lib/settings.js b/packages/node_modules/@node-red/runtime/lib/settings.js
index 16667d177..989b83d9b 100644
--- a/packages/node_modules/@node-red/runtime/lib/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/settings.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var clone = require("clone");
 var assert = require("assert");
 var log = require("@node-red/util").log; // TODO: separate module
@@ -90,10 +89,10 @@ var persistentSettings = {
         globalSettings[prop] = clone(value);
         try {
             assert.deepEqual(current,value);
-            return when.resolve();
         } catch(err) {
             return storage.saveSettings(clone(globalSettings));
         }
+        return Promise.resolve();
     },
     delete: function(prop) {
         if (localSettings.hasOwnProperty(prop)) {
@@ -106,7 +105,7 @@ var persistentSettings = {
             delete globalSettings[prop];
             return storage.saveSettings(clone(globalSettings));
         }
-        return when.resolve();
+        return Promise.resolve();
     },
 
     available: function() {
@@ -180,7 +179,7 @@ var persistentSettings = {
         userSettings[username] = settings;
         try {
             assert.deepEqual(current,settings);
-            return when.resolve();
+            return Promise.resolve();
         } catch(err) {
             globalSettings.users = userSettings;
             return storage.saveSettings(clone(globalSettings));
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/index.js b/packages/node_modules/@node-red/runtime/lib/storage/index.js
index d3350a95e..f5e07e254 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/index.js
@@ -14,11 +14,10 @@
  * limitations under the License.
  **/
 
-var when = require('when');
 var Path = require('path');
 var crypto = require('crypto');
 
-var log = require("@node-red/util").log; // TODO: separate module
+var log = require("@node-red/util").log;
 
 var runtime;
 var storageModule;
@@ -50,15 +49,13 @@ function is_malicious(path) {
 }
 
 var storageModuleInterface = {
-        init: function(_runtime) {
+        init: async function(_runtime) {
             runtime = _runtime;
-            try {
-                storageModule = moduleSelector(runtime.settings);
-                settingsAvailable = storageModule.hasOwnProperty("getSettings") && storageModule.hasOwnProperty("saveSettings");
-                sessionsAvailable = storageModule.hasOwnProperty("getSessions") && storageModule.hasOwnProperty("saveSessions");
-            } catch (e) {
-                return when.reject(e);
-            }
+            // Any errors thrown by the module will get passed up to the called
+            // as a rejected promise
+            storageModule = moduleSelector(runtime.settings);
+            settingsAvailable = storageModule.hasOwnProperty("getSettings") && storageModule.hasOwnProperty("saveSettings");
+            sessionsAvailable = storageModule.hasOwnProperty("getSessions") && storageModule.hasOwnProperty("saveSessions");
             if (!!storageModule.projects) {
                 var projectsEnabled = false;
                 if (runtime.settings.hasOwnProperty("editorTheme") && runtime.settings.editorTheme.hasOwnProperty("projects")) {
@@ -73,7 +70,7 @@ var storageModuleInterface = {
             }
             return storageModule.init(runtime.settings,runtime);
         },
-        getFlows: function() {
+        getFlows: async function() {
             return storageModule.getFlows().then(function(flows) {
                 return storageModule.getCredentials().then(function(creds) {
                     var result = {
@@ -85,14 +82,14 @@ var storageModuleInterface = {
                 })
             });
         },
-        saveFlows: function(config, user) {
+        saveFlows: async function(config, user) {
             var flows = config.flows;
             var credentials = config.credentials;
             var credentialSavePromise;
             if (config.credentialsDirty) {
                 credentialSavePromise = storageModule.saveCredentials(credentials);
             } else {
-                credentialSavePromise = when.resolve();
+                credentialSavePromise = Promise.resolve();
             }
             delete config.credentialsDirty;
 
@@ -105,64 +102,60 @@ var storageModuleInterface = {
         // getCredentials: function() {
         //     return storageModule.getCredentials();
         // },
-        saveCredentials: function(credentials) {
+        saveCredentials: async function(credentials) {
             return storageModule.saveCredentials(credentials);
         },
-        getSettings: function() {
+        getSettings: async function() {
             if (settingsAvailable) {
                 return storageModule.getSettings();
             } else {
-                return when.resolve(null);
+                return null
             }
         },
-        saveSettings: function(settings) {
+        saveSettings: async function(settings) {
             if (settingsAvailable) {
                 return settingsSaveMutex.runExclusive(() => storageModule.saveSettings(settings))
-            } else {
-                return when.resolve();
             }
         },
-        getSessions: function() {
+        getSessions: async function() {
             if (sessionsAvailable) {
                 return storageModule.getSessions();
             } else {
-                return when.resolve(null);
+                return null
             }
         },
-        saveSessions: function(sessions) {
+        saveSessions: async function(sessions) {
             if (sessionsAvailable) {
                 return storageModule.saveSessions(sessions);
-            } else {
-                return when.resolve();
             }
         },
 
         /* Library Functions */
 
-        getLibraryEntry: function(type, path) {
+        getLibraryEntry: async function(type, path) {
             if (is_malicious(path)) {
                 var err = new Error();
                 err.code = "forbidden";
-                return when.reject(err);
+                throw err;
             }
             return storageModule.getLibraryEntry(type, path);
         },
-        saveLibraryEntry: function(type, path, meta, body) {
+        saveLibraryEntry: async function(type, path, meta, body) {
             if (is_malicious(path)) {
                 var err = new Error();
                 err.code = "forbidden";
-                return when.reject(err);
+                throw err;
             }
             return storageModule.saveLibraryEntry(type, path, meta, body);
         },
 
 /* Deprecated functions */
-        getAllFlows: function() {
+        getAllFlows: async function() {
             if (storageModule.hasOwnProperty("getAllFlows")) {
                 return storageModule.getAllFlows();
             } else {
                 if (libraryFlowsCachedResult) {
-                    return Promise.resolve(libraryFlowsCachedResult);
+                    return libraryFlowsCachedResult;
                 } else {
                     return listFlows("/").then(function(result) {
                         libraryFlowsCachedResult = result;
@@ -175,7 +168,7 @@ var storageModuleInterface = {
             if (is_malicious(fn)) {
                 var err = new Error();
                 err.code = "forbidden";
-                return when.reject(err);
+                throw err;
             }
             if (storageModule.hasOwnProperty("getFlow")) {
                 return storageModule.getFlow(fn);
@@ -188,7 +181,7 @@ var storageModuleInterface = {
             if (is_malicious(fn)) {
                 var err = new Error();
                 err.code = "forbidden";
-                return when.reject(err);
+                throw err;
             }
             libraryFlowsCachedResult = null;
             if (storageModule.hasOwnProperty("saveFlow")) {
@@ -204,40 +197,36 @@ var storageModuleInterface = {
 
 function listFlows(path) {
     return storageModule.getLibraryEntry("flows",path).then(function(res) {
-        return when.promise(function(resolve) {
-            var promises = [];
-            res.forEach(function(r) {
-                if (typeof r === "string") {
-                    promises.push(listFlows(Path.join(path,r)));
-                } else {
-                    promises.push(when.resolve(r));
-                }
-            });
-            var i=0;
-            when.settle(promises).then(function(res2) {
-                var result = {};
-                res2.forEach(function(r) {
-                    // TODO: name||fn
-                    if (r.value.fn) {
-                        var name = r.value.name;
-                        if (!name) {
-                            name = r.value.fn.replace(/\.json$/, "");
-                        }
-                        result.f = result.f || [];
-                        result.f.push(name);
-                    } else {
-                        result.d = result.d || {};
-                        result.d[res[i]] = r.value;
-                        //console.log(">",r.value);
+        const promises = [];
+        res.forEach(function(r) {
+            if (typeof r === "string") {
+                promises.push(listFlows(Path.join(path,r)));
+            } else {
+                promises.push(Promise.resolve(r));
+            }
+        });
+        return Promise.all(promises).then(res2 => {
+            let i = 0;
+            const result = {};
+            res2.forEach(function(r) {
+                // TODO: name||fn
+                if (r.fn) {
+                    var name = r.name;
+                    if (!name) {
+                        name = r.fn.replace(/\.json$/, "");
                     }
-                    i++;
-                });
-                resolve(result);
+                    result.f = result.f || [];
+                    result.f.push(name);
+                } else {
+                    result.d = result.d || {};
+                    result.d[res[i]] = r;
+                    //console.log(">",r.value);
+                }
+                i++;
             });
+            return result;
         });
     });
 }
 
-
-
 module.exports = storageModuleInterface;
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js
index 22f01c978..fbcb44e2f 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js
@@ -15,9 +15,7 @@
  **/
 
 var fs = require('fs-extra');
-var when = require('when');
 var fspath = require("path");
-var nodeFn = require('when/node/function');
 
 var util = require("./util");
 
@@ -90,14 +88,14 @@ function getLibraryEntry(type,path) {
     var rootPath = fspath.join(libDir,type,path);
 
     // don't create the folder if it does not exist - we are only reading....
-    return nodeFn.call(fs.lstat, rootPath).then(function(stats) {
+    return fs.lstat(rootPath).then(function(stats) {
         if (stats.isFile()) {
             return getFileBody(root,path);
         }
         if (path.substr(-1) == '/') {
             path = path.substr(0,path.length-1);
         }
-        return nodeFn.call(fs.readdir, rootPath).then(function(fns) {
+        return fs.readdir(rootPath).then(function(fns) {
             var dirs = [];
             var files = [];
             fns.sort().filter(function(fn) {
@@ -143,21 +141,19 @@ function getLibraryEntry(type,path) {
 }
 
 module.exports = {
-    init: function(_settings) {
+    init: async function(_settings) {
         settings = _settings;
         libDir = fspath.join(settings.userDir,"lib");
         libFlowsDir = fspath.join(libDir,"flows");
         if (!settings.readOnly) {
             return fs.ensureDir(libFlowsDir);
-        } else {
-            return when.resolve();
         }
     },
     getLibraryEntry: getLibraryEntry,
 
-    saveLibraryEntry: function(type,path,meta,body) {
+    saveLibraryEntry: async function(type,path,meta,body) {
         if (settings.readOnly) {
-            return when.resolve();
+            return;
         }
         if (type === "flows" && !path.endsWith(".json")) {
             path += ".json";
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
index 0fbf89de4..4057f83b3 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js
@@ -16,7 +16,6 @@
 
 
 var fs = require('fs-extra');
-var when = require('when');
 var fspath = require("path");
 var os = require('os');
 
@@ -27,6 +26,7 @@ var sshKeys = require("./ssh");
 var settings;
 var runtime;
 var log = require("@node-red/util").log;
+const events = require("@node-red/util").events;
 
 var projectsDir;
 
@@ -108,12 +108,12 @@ Project.prototype.load = function () {
                     // package.json isn't valid JSON... is a merge underway?
                     project.package = {};
                 }
-            }));
+            }).catch(err => {})); //
             if (missingFiles.indexOf('README.md') === -1) {
                 project.paths['README.md'] = fspath.join(project.paths.root,"README.md");
                 promises.push(fs.readFile(fspath.join(project.path,project.paths['README.md']),"utf8").then(function(content) {
                     project.description = content;
-                }));
+                }).catch(err => {}));
             } else {
                 project.description = "";
             }
@@ -133,9 +133,9 @@ Project.prototype.load = function () {
         //     project.paths.credentialsFile = fspath.join(project.path,"flow_cred.json");
         // }
 
-        promises.push(project.loadRemotes());
+        promises.push(project.loadRemotes().catch(err => {}));
 
-        return when.settle(promises).then(function(results) {
+        return Promise.all(promises).then(function(results) {
             return project;
         })
     });
@@ -239,7 +239,7 @@ Project.prototype.isMerging = function() {
     return this.merging;
 }
 
-Project.prototype.update = function (user, data) {
+Project.prototype.update = async function (user, data) {
     var username;
     if (!user) {
         username = "_";
@@ -279,7 +279,7 @@ Project.prototype.update = function (user, data) {
             this.credentialSecret !== existingSecret) { // key doesn't match provided existing key
                 var e = new Error("Cannot change credentialSecret without current key");
                 e.code = "missing_current_credential_key";
-                return when.reject(e);
+                throw e;
         }
         this.credentialSecret = secret;
 
@@ -292,7 +292,7 @@ Project.prototype.update = function (user, data) {
     if (this.missingFiles.indexOf('package.json') !== -1) {
         if (!data.files || !data.files.package) {
             // Cannot update a project that doesn't have a known package.json
-            return Promise.reject("Cannot update project with missing package.json");
+            throw new Error("Cannot update project with missing package.json");
         }
     }
 
@@ -302,9 +302,12 @@ Project.prototype.update = function (user, data) {
             // We have a package file. It could be one that doesn't exist yet,
             // or it does exist and we need to load it.
             if (!/package\.json$/.test(data.files.package)) {
-                return Promise.reject("Invalid package file: "+data.files.package)
+                return new Error("Invalid package file: "+data.files.package)
             }
             var root = data.files.package.substring(0,data.files.package.length-12);
+            if (/^\.\./.test(fspath.relative(this.path,fspath.join(this.path,data.files.package)))) {
+                return Promise.reject("Invalid package file: "+data.files.package)
+            }
             this.paths.root = root;
             this.paths['package.json'] = data.files.package;
             globalProjectSettings.projects[this.name].rootPath = root;
@@ -322,12 +325,18 @@ Project.prototype.update = function (user, data) {
         }
 
         if (data.files.hasOwnProperty('flow') && this.package['node-red'].settings.flowFile !== data.files.flow.substring(this.paths.root.length)) {
+            if (/^\.\./.test(fspath.relative(this.path,fspath.join(this.path,data.files.flow)))) {
+                return Promise.reject("Invalid flow file: "+data.files.flow)
+            }
             this.paths.flowFile = data.files.flow;
             this.package['node-red'].settings.flowFile = data.files.flow.substring(this.paths.root.length);
             savePackage = true;
             flowFilesChanged = true;
         }
         if (data.files.hasOwnProperty('credentials') && this.package['node-red'].settings.credentialsFile !== data.files.credentials.substring(this.paths.root.length)) {
+            if (/^\.\./.test(fspath.relative(this.path,fspath.join(this.path,data.files.credentials)))) {
+                return Promise.reject("Invalid credentials file: "+data.files.credentials)
+            }
             this.paths.credentialsFile = data.files.credentials;
             this.package['node-red'].settings.credentialsFile = data.files.credentials.substring(this.paths.root.length);
             // Don't know if the credSecret is invalid or not so clear the flag
@@ -391,20 +400,20 @@ Project.prototype.update = function (user, data) {
                 modifyRemotesPromise = modifyRemotesPromise.then(function() {
                     return project.loadRemotes();
                 });
-                promises.push(modifyRemotesPromise);
+                promises.push(modifyRemotesPromise.catch(err => {}));
             }
         }
     }
 
 
     if (saveSettings) {
-        promises.push(settings.set("projects",globalProjectSettings));
+        promises.push(settings.set("projects",globalProjectSettings).catch(err => {}));
     }
 
     var modifiedFiles = [];
 
     if (saveREADME) {
-        promises.push(util.writeFile(fspath.join(this.path,this.paths['README.md']), this.description));
+        promises.push(util.writeFile(fspath.join(this.path,this.paths['README.md']), this.description).catch(err => {}));
         modifiedFiles.push('README.md');
     }
     if (savePackage) {
@@ -416,12 +425,12 @@ Project.prototype.update = function (user, data) {
             }
             this.package = Object.assign(currentPackage,this.package);
             return util.writeFile(fspath.join(project.path,this.paths['package.json']), JSON.stringify(this.package,"",4));
-        }));
+        }).catch(err => {}));
         modifiedFiles.push('package.json');
     }
-    return when.settle(promises).then(function(res) {
+    return Promise.all(promises).then(function(res) {
         var gitSettings = getUserGitSettings(user) || {};
-        var workflowMode = (gitSettings.workflow||{}).mode || "manual";
+        var workflowMode = (gitSettings.workflow||{}).mode || settings.editorTheme.projects.workflow.mode;
         if (workflowMode === 'auto') {
             return project.stageFile(modifiedFiles.map(f => project.paths[f])).then(() => {
                 return project.commit(user,{message:"Update "+modifiedFiles.join(", ")})
@@ -490,6 +499,10 @@ Project.prototype.getFile = function (filePath,treeish) {
     if (treeish !== "_") {
         return gitTools.getFile(this.path, filePath, treeish);
     } else {
+        let fullPath = fspath.join(this.path,filePath);
+        if (/^\.\./.test(fspath.relative(this.path,fullPath))) {
+            throw new Error("Invalid file name")
+        }
         return fs.readFile(fspath.join(this.path,filePath),"utf8");
     }
 };
@@ -533,7 +546,7 @@ Project.prototype.status = function(user, includeRemote) {
                 result.merging = true;
                 if (!self.merging) {
                     self.merging = true;
-                    runtime.events.emit("runtime-event",{
+                    events.emit("runtime-event",{
                         id:"runtime-state",
                         payload:{
                             type:"warning",
@@ -557,7 +570,7 @@ Project.prototype.status = function(user, includeRemote) {
             }
             if (result.commits.total === 0 && Object.keys(result.files).length === 0) {
                 if (!self.empty) {
-                    runtime.events.emit("runtime-event",{
+                    events.emit("runtime-event",{
                         id:"runtime-state",
                         payload:{
                             type:"warning",
@@ -571,9 +584,9 @@ Project.prototype.status = function(user, includeRemote) {
             } else {
                 if (self.empty) {
                     if (self.paths.flowFile) {
-                        runtime.events.emit("runtime-event",{id:"runtime-state",retain:true});
+                        events.emit("runtime-event",{id:"runtime-state",retain:true});
                     } else {
-                        runtime.events.emit("runtime-event",{
+                        events.emit("runtime-event",{
                             id:"runtime-state",
                             payload:{
                                 type:"warning",
@@ -639,6 +652,11 @@ Project.prototype.pull = function (user,remoteBranchName,setRemote,allowUnrelate
 
 Project.prototype.resolveMerge = function (file,resolutions) {
     var filePath = fspath.join(this.path,file);
+
+    if (/^\.\./.test(fspath.relative(this.path,filePath))) {
+        throw new Error("Invalid file name")
+    }
+
     var self = this;
     if (typeof resolutions === 'string') {
         return util.writeFile(filePath, resolutions).then(function() {
@@ -944,32 +962,17 @@ function createDefaultProject(user, project) {
 }
 function checkProjectFiles(project) {
     var promises = [];
-    var paths = [];
+    var missing = [];
     for (var file in defaultFileSet) {
         if (defaultFileSet.hasOwnProperty(file)) {
-            paths.push(file);
-            promises.push(fs.stat(fspath.join(project.path,project.paths.root,file)));
+            (function(f) {
+                promises.push(fs.stat(fspath.join(project.path,project.paths.root,f)).catch(err => {
+                    missing.push(f);
+                }));
+            })(file);
         }
     }
-    return when.settle(promises).then(function(results) {
-        var missing = [];
-        results.forEach(function(result,i) {
-            if (result.state === 'rejected') {
-                missing.push(paths[i]);
-            }
-        });
-        return missing;
-    }).then(function(missing) {
-        // if (createMissing) {
-        //     var promises = [];
-        //     missing.forEach(function(file) {
-        //         promises.push(util.writeFile(fspath.join(projectPath,file),defaultFileSet[file](project)));
-        //     });
-        //     return promises;
-        // } else {
-        return missing;
-        // }
-    });
+    return Promise.all(promises).then(() => missing);
 }
 function createProject(user, metadata) {
     var username;
@@ -1062,7 +1065,10 @@ function loadProject(projectPath) {
 function init(_settings, _runtime) {
     settings = _settings;
     runtime = _runtime;
-    projectsDir = fspath.join(settings.userDir,"projects");
+    projectsDir = fspath.resolve(fspath.join(settings.userDir,"projects"));
+    if(settings.editorTheme.projects.path) {
+        projectsDir = settings.editorTheme.projects.path;
+    }
     authCache.init();
 }
 
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
index dbcb5fb61..e1ded4337 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  **/
 
-var exec = require("../../../../exec");
-
 var authResponseServer = require('./authServer').ResponseServer;
 var sshResponseServer = require('./authServer').ResponseSSHServer;
 var clone = require('clone');
@@ -23,7 +21,7 @@ var path = require("path");
 
 var gitCommand = "git";
 var gitVersion;
-var log = require("@node-red/util").log;
+const {log,exec} = require("@node-red/util");
 
 function runGitCommand(args,cwd,env,emit) {
     log.trace(gitCommand + JSON.stringify(args));
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
index 5e1d4f15b..0533fe5e6 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js
@@ -15,9 +15,7 @@
  **/
 
 var fs = require('fs-extra');
-var when = require('when');
 var fspath = require("path");
-var nodeFn = require('when/node/function');
 var crypto = require('crypto');
 
 var storageSettings = require("../settings");
@@ -30,12 +28,13 @@ var Projects = require("./Project");
 var settings;
 var runtime;
 var log = require("@node-red/util").log;
+const events = require("@node-red/util").events;
 
 var projectsEnabled = false;
 var projectLogMessages = [];
 
 var projectsDir;
-var activeProject
+var activeProject;
 
 var globalGitUser = false;
 
@@ -107,10 +106,20 @@ function init(_settings, _runtime) {
                     } catch(err) {
                     }
                 } else {
+                    // Ensure there's a default workflow mode set
+                    settings.editorTheme.projects.workflow = {
+                        mode: (settings.editorTheme.projects.workflow || {}).mode || "manual"
+                    }
                     globalGitUser = gitConfig.user;
                     Projects.init(settings,runtime);
                     sshTools.init(settings);
-                    projectsDir = fspath.join(settings.userDir,"projects");
+
+                    projectsDir = fspath.resolve(fspath.join(settings.userDir,"projects"));
+
+                    if(settings.editorTheme.projects.path) {
+                      projectsDir = settings.editorTheme.projects.path;
+                    }
+
                     if (!settings.readOnly) {
                         return fs.ensureDir(projectsDir)
                         //TODO: this is accessing settings from storage directly as settings
@@ -207,9 +216,16 @@ function getBackupFilename(filename) {
 }
 
 function loadProject(name) {
+    let fullPath = fspath.resolve(fspath.join(projectsDir,name));
     var projectPath = name;
     if (projectPath.indexOf(fspath.sep) === -1) {
-        projectPath = fspath.join(projectsDir,name);
+        projectPath = fullPath;
+    } else {
+        // Ensure this project dir is under projectsDir;
+        let relativePath = fspath.relative(projectsDir,fullPath);
+        if (/^\.\./.test(relativePath)) {
+            throw new Error("Invalid project name")
+        }
     }
     return Projects.load(projectPath).then(function(project) {
         activeProject = project;
@@ -223,7 +239,6 @@ function loadProject(name) {
 
 function getProject(user, name) {
     checkActiveProject(name);
-    //return when.resolve(activeProject.info);
     return Promise.resolve(activeProject.export());
 }
 
@@ -234,6 +249,10 @@ function deleteProject(user, name) {
         throw e;
     }
     var projectPath = fspath.join(projectsDir,name);
+    let relativePath = fspath.relative(projectsDir,projectPath);
+    if (/^\.\./.test(relativePath)) {
+        throw new Error("Invalid project name")
+    }
     return Projects.delete(user, projectPath);
 }
 
@@ -358,11 +377,11 @@ function getActiveProject(user) {
 function reloadActiveProject(action) {
     return runtime.nodes.stopFlows().then(function() {
         return runtime.nodes.loadFlows(true).then(function() {
-            runtime.events.emit("runtime-event",{id:"project-update", payload:{ project: activeProject.name, action:action}});
+            events.emit("runtime-event",{id:"project-update", payload:{ project: activeProject.name, action:action}});
         }).catch(function(err) {
             // We're committed to the project change now, so notify editors
             // that it has changed.
-            runtime.events.emit("runtime-event",{id:"project-update", payload:{ project: activeProject.name, action:action}});
+            events.emit("runtime-event",{id:"project-update", payload:{ project: activeProject.name, action:action}});
             throw err;
         });
     });
@@ -392,6 +411,10 @@ function createProject(user, metadata) {
         metadata.files.credentialSecret = currentEncryptionKey;
     }
     metadata.path = fspath.join(projectsDir,metadata.name);
+    if (/^\.\./.test(fspath.relative(projectsDir,metadata.path))) {
+        throw new Error("Invalid project name")
+    }
+
     return Projects.create(user, metadata).then(function(p) {
         return setActiveProject(user, p.name);
     }).then(function() {
@@ -495,10 +518,15 @@ var flowsFileBackup;
 var credentialsFile;
 var credentialsFileBackup;
 
-function getFlows() {
+async function getFlows() {
     if (!initialFlowLoadComplete) {
         initialFlowLoadComplete = true;
         log.info(log._("storage.localfilesystem.user-dir",{path:settings.userDir}));
+
+        if (projectsEnabled) {
+            log.info(log._("storage.localfilesystem.projects.projects-directory", {projectsDirectory: projectsDir}));
+        }
+        
         if (activeProject) {
             // At this point activeProject will be a string, so go load it and
             // swap in an instance of Project
@@ -522,25 +550,25 @@ function getFlows() {
             log.warn("Project repository is empty");
             error = new Error("Project repository is empty");
             error.code = "project_empty";
-            return when.reject(error);
+            throw error;
         }
         if (activeProject.missingFiles && activeProject.missingFiles.indexOf('package.json') !== -1) {
             log.warn("Project missing package.json");
             error = new Error("Project missing package.json");
             error.code = "missing_package_file";
-            return when.reject(error);
+            throw error;
         }
         if (!activeProject.getFlowFile()) {
             log.warn("Project has no flow file");
             error = new Error("Project has no flow file");
             error.code = "missing_flow_file";
-            return when.reject(error);
+            throw error;
         }
         if (activeProject.isMerging()) {
             log.warn("Project has unmerged changes");
             error = new Error("Project has unmerged changes. Cannot load flows");
             error.code = "git_merge_conflict";
-            return when.reject(error);
+            throw error;
         }
 
     }
@@ -554,14 +582,14 @@ function getFlows() {
     });
 }
 
-function saveFlows(flows, user) {
+async function saveFlows(flows, user) {
     if (settings.readOnly) {
-        return when.resolve();
+        return
     }
     if (activeProject && activeProject.isMerging()) {
         var error = new Error("Project has unmerged changes. Cannot deploy new flows");
         error.code = "git_merge_conflict";
-        return when.reject(error);
+        throw error;
     }
 
     flowsFileExists = true;
@@ -576,11 +604,13 @@ function saveFlows(flows, user) {
     }
     return util.writeFile(flowsFullPath, flowData, flowsFileBackup).then(() => {
         var gitSettings = getUserGitSettings(user) || {};
-        var workflowMode = (gitSettings.workflow||{}).mode || "manual";
-        if (activeProject && workflowMode === 'auto') {
-            return activeProject.stageFile([flowsFullPath, credentialsFile]).then(() => {
-                return activeProject.commit(user,{message:"Update flow files"})
-            })
+        if (activeProject) {
+            var workflowMode = (gitSettings.workflow||{}).mode || settings.editorTheme.projects.workflow.mode;
+            if (workflowMode === 'auto') {
+                return activeProject.stageFile([flowsFullPath, credentialsFile]).then(() => {
+                    return activeProject.commit(user,{message:"Update flow files"})
+                })
+            }
         }
     });
 }
@@ -589,9 +619,9 @@ function getCredentials() {
     return util.readFile(credentialsFile,credentialsFileBackup,{},'credentials');
 }
 
-function saveCredentials(credentials) {
+async function saveCredentials(credentials) {
     if (settings.readOnly) {
-        return when.resolve();
+        return;
     }
 
     var credentialData;
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js
index 25dacd3b1..cafe9bcb7 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js
@@ -15,7 +15,6 @@
  **/
 
 var fs = require('fs-extra');
-var when = require('when');
 var fspath = require("path");
 var keygen = require("./keygen");
 
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js
index 6b4deaa5a..575b0c056 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require('when');
 var fs = require('fs-extra');
 var fspath = require("path");
 
@@ -30,8 +29,8 @@ module.exports = {
         settings = _settings;
         sessionsFile = fspath.join(settings.userDir,".sessions.json");
     },
-    getSessions: function() {
-        return when.promise(function(resolve,reject) {
+    getSessions: async function() {
+        return new Promise(function(resolve,reject) {
             fs.readFile(sessionsFile,'utf8',function(err,data){
                 if (!err) {
                     try {
@@ -44,9 +43,9 @@ module.exports = {
             })
         });
     },
-    saveSessions: function(sessions) {
+    saveSessions: async function(sessions) {
         if (settings.readOnly) {
-            return when.resolve();
+            return;
         }
         return util.writeFile(sessionsFile,JSON.stringify(sessions));
     }
diff --git a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
index bc866e09e..02e15aa88 100644
--- a/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/en-US/runtime.json
@@ -42,6 +42,7 @@
             "uninstall-failed-long": "Uninstall of module __name__ failed:",
             "uninstalled": "Uninstalled module: __name__"
         },
+        "deprecatedOption": "Use of __old__ is deprecated. Use __new__ instead",
         "unable-to-listen": "Unable to listen on __listenpath__",
         "port-in-use": "Error: port in use",
         "uncaught-exception": "Uncaught Exception:",
@@ -155,6 +156,7 @@
             "projects": {
                 "changing-project": "Setting active project : __project__",
                 "active-project": "Active project : __project__",
+                "projects-directory": "Projects directory: __projectsDirectory__",
                 "project-not-found": "Project not found : __project__",
                 "no-active-project": "No active project : using default flows file",
                 "disabled": "Projects disabled : editorTheme.projects.enabled=false",
diff --git a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
index ff871e3c2..d8ee67572 100644
--- a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json
@@ -41,6 +41,7 @@
             "uninstall-failed-long": "モジュール __name__ のアンインストールに失敗しました:",
             "uninstalled": "モジュール __name__ をアンインストールしました"
         },
+        "deprecatedOption": "__old__ の利用は非推奨です。代わりに __new__ を使用してください",
         "unable-to-listen": "__listenpath__ に対してlistenできません",
         "port-in-use": "エラー: ポートが使用中です",
         "uncaught-exception": "未補足の例外:",
@@ -149,6 +150,7 @@
             "projects": {
                 "changing-project": "プロジェクトを設定します : __project__",
                 "active-project": "選択中のプロジェクト : __project__",
+                "projects-directory": "プロジェクトディレクトリ: __projectsDirectory__",
                 "project-not-found": "プロジェクトが見つかりません : __project__",
                 "no-active-project": "プロジェクトが選択されていません : デフォルトのフローファイルを使用します",
                 "disabled": "プロジェクトは無効化されています : editorTheme.projects.enabled=false",
@@ -169,6 +171,7 @@
         "error-invalid-default-module": "デフォルトコンテキストストアが不明: '__storage__'",
         "unknown-store": "不明なコンテキストストア '__name__' が指定されました。デフォルトストアを使用します。",
         "localfilesystem": {
+            "invalid-json": "コンテキストファイル '__file__' のJSONが不正",
             "error-circular": "コンテキスト __scope__ は永続化できない循環参照を含んでいます",
             "error-write": "コンテキスト書込みエラー: __message__"
         }
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 17622c6b4..cd828c50b 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -18,11 +18,10 @@
     "dependencies": {
         "@node-red/registry": "1.3.0-beta.1",
         "@node-red/util": "1.3.0-beta.1",
-        "async-mutex": "0.2.4",
+        "async-mutex": "0.2.6",
         "clone": "2.1.2",
         "express": "4.17.1",
         "fs-extra": "8.1.0",
-        "json-stringify-safe": "5.0.1",
-        "when": "3.7.8"
+        "json-stringify-safe": "5.0.1"
     }
 }
diff --git a/packages/node_modules/@node-red/util/index.js b/packages/node_modules/@node-red/util/index.js
index 66ac91bd3..aeb566540 100644
--- a/packages/node_modules/@node-red/util/index.js
+++ b/packages/node_modules/@node-red/util/index.js
@@ -17,6 +17,8 @@
 const log = require("./lib/log");
 const i18n = require("./lib/i18n");
 const util = require("./lib/util");
+const events = require("./lib/events");
+const exec = require("./lib/exec");
 
 /**
  * This module provides common utilities for the Node-RED runtime and editor
@@ -31,7 +33,7 @@ module.exports = {
     */
     init: function(settings) {
         log.init(settings);
-        i18n.init();
+        i18n.init(settings);
     },
 
     /**
@@ -54,4 +56,18 @@ module.exports = {
     * @memberof @node-red/util
     */
     util: util,
+
+    /**
+    * Runtime events
+    * @mixes @node-red/util_event
+    * @memberof @node-red/util
+    */
+    events: events,
+
+    /**
+    * Run system commands with event-log integration
+    * @mixes @node-red/util_exec
+    * @memberof @node-red/util
+    */
+    exec: exec
 }
diff --git a/packages/node_modules/@node-red/runtime/lib/events.js b/packages/node_modules/@node-red/util/lib/events.js
similarity index 92%
rename from packages/node_modules/@node-red/runtime/lib/events.js
rename to packages/node_modules/@node-red/util/lib/events.js
index 8e6935222..df45b4d16 100644
--- a/packages/node_modules/@node-red/runtime/lib/events.js
+++ b/packages/node_modules/@node-red/util/lib/events.js
@@ -14,6 +14,11 @@
  * limitations under the License.
  **/
 
+ /**
+  * Runtime events
+  * @mixin @node-red/util_events
+  */
+
 const events = new (require("events")).EventEmitter();
 
 
@@ -45,14 +50,14 @@ module.exports = events;
 
 /**
  * Runtime events emitter
- * @mixin @node-red/runtime_events
+ * @mixin @node-red/util_events
  */
 
 /**
  * Register an event listener for a runtime event
  * @name on
  * @function
- * @memberof @node-red/runtime_events
+ * @memberof @node-red/util_events
  * @param {String} eventName - the name of the event to listen to
  * @param {Function} listener - the callback function for the event
  */
@@ -61,7 +66,7 @@ module.exports = events;
   * Emit an event to all of its registered listeners
   * @name emit
   * @function
-  * @memberof @node-red/runtime_events
+  * @memberof @node-red/util_events
   * @param {String} eventName - the name of the event to emit
   * @param {any} ...args - the arguments to pass in the event
   * @return {Boolean} - whether the event had listeners or not
diff --git a/packages/node_modules/@node-red/runtime/lib/exec.js b/packages/node_modules/@node-red/util/lib/exec.js
similarity index 67%
rename from packages/node_modules/@node-red/runtime/lib/exec.js
rename to packages/node_modules/@node-red/util/lib/exec.js
index 0ef3c069c..c7197ef65 100644
--- a/packages/node_modules/@node-red/runtime/lib/exec.js
+++ b/packages/node_modules/@node-red/util/lib/exec.js
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright JS Foundation and other contributors, http://js.foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,19 +14,41 @@
  * limitations under the License.
  **/
 
-const child_process = require('child_process');
-const { util } = require('@node-red/util');
+/**
+ * Run system commands with event-log integration
+ * @mixin @node-red/util_exec
+ */
 
-var events;
+const child_process = require('child_process');
+const events = require("./events");
+const util = require('./util');
 
 function logLines(id,type,data) {
     events.emit("event-log", {id:id,payload:{ts: Date.now(),data:data,type:type}});
 }
 
 module.exports = {
-    init: function(_runtime) {
-        events = _runtime.events;
-    },
+    /**
+     * Run a system command with stdout/err being emitted as 'event-log' events
+     * on the @node-red/util/events handler.
+     *
+     * The main arguments to this function are the same as passed to `child_process.spawn`
+     *
+     * @param {String} command - the command to run
+     * @param {Array}  args - arguments for the command
+     * @param {Object} options - options to pass child_process.spawn
+     * @param {Boolean} emit - whether to emit events to the event-log for each line of stdout/err
+     * @return {Promise} A promise that resolves (rc=0) or rejects (rc!=0) when the command completes. The value
+     *                   of the promise is an object of the form:
+     *
+     *       {
+     *           code: <exit code>,
+     *           stdout: <standard output from the command>,
+     *           stderr: <standard error from the command>
+     *       }
+
+     * @memberof @node-red/util_exec
+     */
     run: function(command,args,options,emit) {
         var invocationId = util.generateId();
 
diff --git a/packages/node_modules/@node-red/util/lib/i18n.js b/packages/node_modules/@node-red/util/lib/i18n.js
index d95f4bec6..96a66ba1d 100644
--- a/packages/node_modules/@node-red/util/lib/i18n.js
+++ b/packages/node_modules/@node-red/util/lib/i18n.js
@@ -22,9 +22,8 @@
 
 var i18n = require("i18next");
 
-var when = require("when");
 var path = require("path");
-var fs = require("fs");
+var fs = require("fs-extra");
 
 var defaultLang = "en-US";
 
@@ -38,16 +37,16 @@ var initPromise;
  */
 function registerMessageCatalogs(catalogs) {
     var promises = catalogs.map(function(catalog) {
-        return registerMessageCatalog(catalog.namespace,catalog.dir,catalog.file);
+        return registerMessageCatalog(catalog.namespace,catalog.dir,catalog.file).catch(err => {});
     });
-    return when.settle(promises);
+    return Promise.all(promises);
 }
 
 /**
  * Register a message catalog with i18n.
  * @memberof @node-red/util_i18n
  */
-function registerMessageCatalog(namespace,dir,file) {
+async function registerMessageCatalog(namespace,dir,file) {
     return initPromise.then(function() {
         return new Promise((resolve,reject) => {
             resourceMap[namespace] = { basedir:dir, file:file, lngs: []};
@@ -82,36 +81,28 @@ function mergeCatalog(fallback,catalog) {
 }
 
 
-function readFile(lng, ns) {
-    return new Promise((resolve, reject) => {
-        if (resourceCache[ns] && resourceCache[ns][lng]) {
-            resolve(resourceCache[ns][lng]);
-        } else if (resourceMap[ns]) {
-            var file = path.join(resourceMap[ns].basedir, lng, resourceMap[ns].file);
-            fs.readFile(file, "utf8", function (err, content) {
-                if (err) {
-                    reject(err);
-                } else {
-                    try {
-                        resourceCache[ns] = resourceCache[ns] || {};
-                        resourceCache[ns][lng] = JSON.parse(content.replace(/^\uFEFF/, ''));
-                        var baseLng = lng.split('-')[0];
-                        if (baseLng !== lng && resourceCache[ns][baseLng]) {
-                            mergeCatalog(resourceCache[ns][baseLng], resourceCache[ns][lng]);
-                        }
-                        if (lng !== defaultLang) {
-                            mergeCatalog(resourceCache[ns][defaultLang], resourceCache[ns][lng]);
-                        }
-                        resolve(resourceCache[ns][lng]);
-                    } catch (e) {
-                        reject(e);
-                    }
-                }
-            });
-        } else {
-            reject(new Error("Unrecognised namespace"));
+async function readFile(lng, ns) {
+    if (/[^a-z\-]/i.test(lng)) {
+        throw new Error("Invalid language: "+lng)
+    }
+    if (resourceCache[ns] && resourceCache[ns][lng]) {
+        return resourceCache[ns][lng];
+    } else if (resourceMap[ns]) {
+        const file = path.join(resourceMap[ns].basedir, lng, resourceMap[ns].file);
+        const content = await fs.readFile(file, "utf8");
+        resourceCache[ns] = resourceCache[ns] || {};
+        resourceCache[ns][lng] = JSON.parse(content.replace(/^\uFEFF/, ''));
+        var baseLng = lng.split('-')[0];
+        if (baseLng !== lng && resourceCache[ns][baseLng]) {
+            mergeCatalog(resourceCache[ns][baseLng], resourceCache[ns][lng]);
         }
-    });
+        if (lng !== defaultLang) {
+            mergeCatalog(resourceCache[ns][defaultLang], resourceCache[ns][lng]);
+        }
+        return resourceCache[ns][lng];
+    } else {
+        throw new Error("Unrecognised namespace");
+    }
 }
 
 var MessageFileLoader = {
@@ -143,11 +134,11 @@ function getCurrentLocale() {
     return undefined;
 }
 
-function init() {
+function init(settings) {
     if (!initPromise) {
         // Keep this as a 'when' promise as top-level red.js uses 'otherwise'
         // and embedded users of NR may have copied that.
-        initPromise = when.promise((resolve,reject) => {
+        initPromise = new Promise((resolve,reject) => {
             i18n.use(MessageFileLoader);
             var opt = {
                 // debug: true,
@@ -161,7 +152,7 @@ function init() {
                     suffix: '__'
                 }
             };
-            var lang = getCurrentLocale();
+            var lang = settings.lang || getCurrentLocale();
             if (lang) {
                 opt.lng = lang;
             }
@@ -182,6 +173,10 @@ function init() {
 function getCatalog(namespace,lang) {
     var result = null;
     lang = lang || defaultLang;
+    if (/[^a-z\-]/i.test(lang)) {
+        throw new Error("Invalid language: "+lng)
+    }
+
     if (resourceCache.hasOwnProperty(namespace)) {
         result = resourceCache[namespace][lang];
         if (!result) {
diff --git a/packages/node_modules/@node-red/util/lib/log.js b/packages/node_modules/@node-red/util/lib/log.js
index 8d7b84966..341019080 100644
--- a/packages/node_modules/@node-red/util/lib/log.js
+++ b/packages/node_modules/@node-red/util/lib/log.js
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright JS Foundation and other contributors, http://js.foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * @ignore
  **/
 
 /**
@@ -91,7 +90,7 @@ var consoleLogger = function(msg) {
             } catch(e){
                 message = 'Exception trying to log: '+util.inspect(message);
             }
-            
+
             util.log("["+levelNames[msg.level]+"] "+(msg.type?"["+msg.type+":"+(msg.name||msg.id)+"] ":"")+message);
         }
     }
diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index 07f506007..54da6b1f9 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -189,11 +189,17 @@ function createError(code, message) {
  *
  * For example, `a["b"].c` returns `['a','b','c']`
  *
+ * If `msg` is provided, any internal cross-references will be evaluated against that
+ * object. Otherwise, it will return a nested set of properties
+ *
+ * For example, without msg set, 'a[msg.foo]' returns `['a', [ 'msg', 'foo'] ]`
+ * But if msg is set to '{"foo": "bar"}', 'a[msg.foo]' returns `['a', 'bar' ]`
+ *
  * @param  {String} str - the property expression
  * @return {Array} the normalised expression
  * @memberof @node-red/util_util
  */
-function normalisePropertyExpression(str) {
+function normalisePropertyExpression(str, msg, toString) {
     // This must be kept in sync with validatePropertyExpression
     // in editor/js/ui/utils.js
 
@@ -205,6 +211,7 @@ function normalisePropertyExpression(str) {
     var start = 0;
     var inString = false;
     var inBox = false;
+    var boxExpression = false;
     var quoteChar;
     var v;
     for (var i=0;i<length;i++) {
@@ -247,8 +254,54 @@ function normalisePropertyExpression(str) {
                 if (i===length-1) {
                     throw createError("INVALID_EXPR","Invalid property expression: unterminated expression");
                 }
-                // Next char is either a quote or a number
-                if (!/["'\d]/.test(str[i+1])) {
+                // Start of a new expression. If it starts with msg it is a nested expression
+                // Need to scan ahead to find the closing bracket
+                if (/^msg[.\[]/.test(str.substring(i+1))) {
+                    var depth = 1;
+                    var inLocalString = false;
+                    var localStringQuote;
+                    for (var j=i+1;j<length;j++) {
+                        if (/["']/.test(str[j])) {
+                            if (inLocalString) {
+                                if (str[j] === localStringQuote) {
+                                    inLocalString = false
+                                }
+                            } else {
+                                inLocalString = true;
+                                localStringQuote = str[j]
+                            }
+                        }
+                        if (str[j] === '[') {
+                            depth++;
+                        } else if (str[j] === ']') {
+                            depth--;
+                        }
+                        if (depth === 0) {
+                            try {
+                                if (msg) {
+                                    var crossRefProp = getMessageProperty(msg, str.substring(i+1,j));
+                                    if (crossRefProp === undefined) {
+                                        throw createError("INVALID_EXPR","Invalid expression: undefined reference at position "+(i+1)+" : "+str.substring(i+1,j))
+                                    }
+                                    parts.push(crossRefProp)
+                                } else {
+                                    parts.push(normalisePropertyExpression(str.substring(i+1,j), msg));
+                                }
+                                inBox = false;
+                                i = j;
+                                start = j+1;
+                                break;
+                            } catch(err) {
+                                throw createError("INVALID_EXPR","Invalid expression started at position "+(i+1))
+                            }
+                        }
+                    }
+                    if (depth > 0) {
+                        throw createError("INVALID_EXPR","Invalid property expression: unmatched '[' at position "+i);
+                    }
+                    continue;
+                } else if (!/["'\d]/.test(str[i+1])) {
+                    // Next char is either a quote or a number
                     throw createError("INVALID_EXPR","Invalid property expression: unexpected "+str[i+1]+" at position "+(i+1));
                 }
                 start = i+1;
@@ -294,6 +347,23 @@ function normalisePropertyExpression(str) {
     if (start < length) {
         parts.push(str.substring(start));
     }
+
+    if (toString) {
+        var result = parts.shift();
+        while(parts.length > 0) {
+            var p = parts.shift();
+            if (typeof p === 'string') {
+                if (/"/.test(p)) {
+                    p = "'"+p+"'";
+                } else {
+                    p = '"'+p+'"';
+                }
+            }
+            result = result+"["+p+"]";
+        }
+        return result;
+    }
+
     return parts;
 }
 
@@ -340,8 +410,7 @@ function getMessageProperty(msg,expr) {
  */
 function getObjectProperty(msg,expr) {
     var result = null;
-    var msgPropParts = normalisePropertyExpression(expr);
-    var m;
+    var msgPropParts = normalisePropertyExpression(expr,msg);
     msgPropParts.reduce(function(obj, key) {
         result = (typeof obj[key] !== "undefined" ? obj[key] : undefined);
         return result;
@@ -381,7 +450,7 @@ function setObjectProperty(msg,prop,value,createMissing) {
     if (typeof createMissing === 'undefined') {
         createMissing = (typeof value !== 'undefined');
     }
-    var msgPropParts = normalisePropertyExpression(prop);
+    var msgPropParts = normalisePropertyExpression(prop, msg);
     var depth = 0;
     var length = msgPropParts.length;
     var obj = msg;
@@ -553,6 +622,10 @@ function evaluateNodeProperty(value, type, node, msg, callback) {
         }
     } else if ((type === 'flow' || type === 'global') && node) {
         var contextKey = parseContextStore(value);
+        if (/\[msg/.test(contextKey.key)) {
+            // The key has a nest msg. reference to evaluate first
+            contextKey.key = normalisePropertyExpression(contextKey.key, msg, true)
+        }
         result = node.context()[type].get(contextKey.key,contextKey.store,callback);
         if (callback) {
             return;
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 9d447a280..41e858c7a 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -20,7 +20,6 @@
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.8.4",
         "lodash.clonedeep": "^4.5.0",
-        "moment-timezone": "0.5.32",
-        "when": "3.7.8"
+        "moment-timezone": "0.5.32"
     }
 }
diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js
index 684ff6d8a..e46e40e26 100644
--- a/packages/node_modules/node-red/lib/red.js
+++ b/packages/node_modules/node-red/lib/red.js
@@ -92,14 +92,39 @@ module.exports = {
      * @memberof node-red
      */
     start: function() {
-        return runtime.start().then(function() {
+        // The top level red.js has always used 'otherwise' on the promise returned
+        // here. This is a non-standard promise function coming from our early use
+        // of the when.js library.
+        // We want to remove all dependency on when.js as native Promises now exist.
+        // But we have the issue that some embedders of Node-RED may have copied our
+        // top-level red.js a bit too much.
+        //
+        let startPromise = runtime.start().then(function() {
             if (apiEnabled) {
                 return api.start();
             }
         });
+        startPromise._then = startPromise.then;
+        startPromise.then = function(resolve,reject) {
+            var inner = startPromise._then(resolve,reject);
+            inner.otherwise = function(cb) {
+                redUtil.log.error("**********************************************");
+                redUtil.log.error("* Deprecated call to RED.start().otherwise() *");
+                redUtil.log.error("* This will be removed in Node-RED 2.x       *");
+                redUtil.log.error("* Use RED.start().catch() instead            *")
+                redUtil.log.error("**********************************************");
+                return inner.catch(cb);
+            }
+            return inner;
+        }
+        return startPromise;
     },
     /**
      * Stop the Node-RED application.
+     *
+     * Once called, Node-RED should not be restarted until the Node.JS process is
+     * restarted.
+     *
      * @return {Promise} - resolves when complete
      * @memberof node-red
      */
@@ -140,10 +165,10 @@ module.exports = {
 
     /**
      * Runtime events emitter
-     * @see @node-red/runtime_events
+     * @see @node-red/util_events
      * @memberof node-red
      */
-    events: runtime.events,
+    events: redUtil.events,
 
     /**
      * Runtime hooks engine
diff --git a/packages/node_modules/node-red/red.js b/packages/node_modules/node-red/red.js
index 32639ea3c..55e355a7c 100755
--- a/packages/node_modules/node-red/red.js
+++ b/packages/node_modules/node-red/red.js
@@ -429,7 +429,7 @@ httpsPromise.then(function(startupHttps) {
         } else {
             RED.log.info(RED.log._("server.headless-mode"));
         }
-    }).otherwise(function(err) {
+    }).catch(function(err) {
         RED.log.error(RED.log._("server.failed-to-start"));
         if (err.stack) {
             RED.log.error(err.stack);
@@ -468,4 +468,5 @@ httpsPromise.then(function(startupHttps) {
 
 }).catch(function(err) {
     console.log("Failed to get https settings: " + err);
+    console.log(err.stack)
 });
diff --git a/packages/node_modules/node-red/settings.js b/packages/node_modules/node-red/settings.js
index fd07630f2..c44046814 100644
--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -42,6 +42,10 @@ module.exports = {
     //  defaults to 120 seconds
     //httpRequestTimeout: 120000,
 
+    // Maximum buffer size for the exec node
+    //  defaults to 10Mb
+    //execMaxBufferSize: 10000000,
+
     // The maximum length, in characters, of any message sent to the debug sidebar tab
     debugMaxLength: 1000,
 
@@ -107,6 +111,10 @@ module.exports = {
 
     // If you installed the optional node-red-dashboard you can set it's path
     // relative to httpRoot
+    // Other optional properties include
+    //  readOnly:{boolean},
+    //  middleware:{function or array}, (req,res,next) - http middleware
+    //  ioMiddleware:{function or array}, (socket,next) - socket.io middleware
     //ui: { path: "ui" },
 
     // Securing Node-RED
@@ -248,6 +256,8 @@ module.exports = {
     // their values. Setting this to true will cause the keys to be listed.
     exportGlobalContextKeys: false,
 
+    // Uncomment the following to run node-red in your preferred language:
+    // lang: "de",
 
     // Context Storage
     // The following property can be used to enable context storage. The configuration
@@ -290,7 +300,15 @@ module.exports = {
     editorTheme: {
         projects: {
             // To enable the Projects feature, set this value to true
-            enabled: false
+            enabled: false,
+            workflow: {
+                // Set the default projects workflow mode.
+                //  - manual - you must manually commit changes
+                //  - auto - changes are automatically committed
+                // This can be overridden per-user from the 'Git config'
+                // section of 'User Settings' within the editor
+                mode: "manual"
+            }
         }
     }
 }
diff --git a/test/nodes/core/function/10-function_spec.js b/test/nodes/core/function/10-function_spec.js
index 63e1031b6..d737875cc 100644
--- a/test/nodes/core/function/10-function_spec.js
+++ b/test/nodes/core/function/10-function_spec.js
@@ -53,6 +53,49 @@ describe('function node', function() {
         });
     });
 
+    it('should send returned message using send()', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"node.send(msg);"},
+        {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                msg.should.have.property('topic', 'bar');
+                msg.should.have.property('payload', 'foo');
+                done();
+            });
+            n1.receive({payload:"foo",topic: "bar"});
+        });
+    });
+
+    it('should do something with the catch node', function(done) {
+        var flow = [{"id":"funcNode","type":"function","wires":[["goodNode"]],"func":"node.error('This is an error', msg);"},{"id":"goodNode","type":"helper"},{"id":"badNode","type":"helper"},{"id":"catchNode","type":"catch","scope":null,"uncaught":false,"wires":[["badNode"]]}];
+        var catchNodeModule = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js")
+        helper.load([catchNodeModule, functionNode], flow, function() {
+            var funcNode = helper.getNode("funcNode");
+            var catchNode = helper.getNode("catchNode");
+            var goodNode = helper.getNode("goodNode");
+            var badNode = helper.getNode("badNode");
+
+            badNode.on("input", function(msg) {
+                msg.should.have.property('topic', 'bar');
+                msg.should.have.property('payload', 'foo');
+                msg.should.have.property('error');
+                msg.error.should.have.property('message',"This is an error");
+                msg.error.should.have.property('source');
+                msg.error.source.should.have.property('id', "funcNode");
+                done();
+            });
+            funcNode.receive({payload:"foo",topic: "bar"});
+        });
+    });
+
+
+
+
+
+/*
+
     it('should be loaded', function(done) {
         var flow = [{id:"n1", type:"function", name: "function" }];
         helper.load(functionNode, flow, function() {
@@ -1560,4 +1603,5 @@ describe('function node', function() {
         });
 
     })
+    */
 });
diff --git a/test/nodes/core/function/10-switch_spec.js b/test/nodes/core/function/10-switch_spec.js
index b431fcaaf..dcb7dfd45 100644
--- a/test/nodes/core/function/10-switch_spec.js
+++ b/test/nodes/core/function/10-switch_spec.js
@@ -119,13 +119,17 @@ describe('switch Node', function() {
      * @param done - callback when done
      */
     function customFlowSwitchTest(flow, shouldReceive, sendPayload, done) {
+        customFlowMessageSwitchTest(flow,shouldReceive,{payload: sendPayload}, done);
+    }
+
+    function customFlowMessageSwitchTest(flow, shouldReceive, message, done) {
         helper.load(switchNode, flow, function() {
             var switchNode1 = helper.getNode("switchNode1");
             var helperNode1 = helper.getNode("helperNode1");
             helperNode1.on("input", function(msg) {
                 try {
                     if (shouldReceive === true) {
-                        should.equal(msg.payload,sendPayload);
+                        should.equal(msg,message);
                         done();
                     } else {
                         should.fail(null, null, "We should never get an input!");
@@ -134,7 +138,7 @@ describe('switch Node', function() {
                     done(err);
                 }
             });
-            switchNode1.receive({payload:sendPayload});
+            switchNode1.receive(message);
             if (shouldReceive === false) {
                 setTimeout(function() {
                     done();
@@ -425,6 +429,29 @@ describe('switch Node', function() {
         });
     });
 
+    it('should use a nested message property to compare value - matches', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload[msg.topic]",rules:[{"t":"eq","v":"bar"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+                    {id:"helperNode1", type:"helper", wires:[]}];
+        customFlowMessageSwitchTest(flow, true, {topic:"foo",payload:{"foo":"bar"}}, done);
+    })
+    it('should use a nested message property to compare value - no match', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload[msg.topic]",rules:[{"t":"eq","v":"bar"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+                    {id:"helperNode1", type:"helper", wires:[]}];
+        customFlowMessageSwitchTest(flow, false, {topic:"foo",payload:{"foo":"none"}}, done);
+
+    })
+
+    it('should use a nested message property to compare nested message property - matches', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload[msg.topic]",rules:[{"t":"eq","v":"payload[msg.topic2]",vt:"msg"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+                    {id:"helperNode1", type:"helper", wires:[]}];
+        customFlowMessageSwitchTest(flow, true, {topic:"foo",topic2:"foo2",payload:{"foo":"bar","foo2":"bar"}}, done);
+    })
+    it('should use a nested message property to compare nested message property - no match', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload[msg.topic]",rules:[{"t":"eq","v":"payload[msg.topic2]",vt:"msg"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+                    {id:"helperNode1", type:"helper", wires:[]}];
+        customFlowMessageSwitchTest(flow, false, {topic:"foo",topic2:"foo2",payload:{"foo":"bar","foo2":"none"}}, done);
+    })
+
     it('should match regex with ignore-case flag set true', function(done) {
         var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"onetwothree","case":true}],checkall:true,outputs:1,wires:[["helperNode1"]]},
                     {id:"helperNode1", type:"helper", wires:[]}];
diff --git a/test/nodes/core/function/15-change_spec.js b/test/nodes/core/function/15-change_spec.js
index 1809d91d9..fc0c14600 100644
--- a/test/nodes/core/function/15-change_spec.js
+++ b/test/nodes/core/function/15-change_spec.js
@@ -98,7 +98,7 @@ describe('change Node', function() {
     });
 
     describe('#set' , function() {
-
+        
         it('sets the value of the message property', function(done) {
             var flow = [{"id":"changeNode1","type":"change","action":"replace","property":"payload","from":"","to":"changed","reg":false,"name":"changeNode","wires":[["helperNode1"]]},
                         {id:"helperNode1", type:"helper", wires:[]}];
@@ -672,6 +672,111 @@ describe('change Node', function() {
             });
         });
 
+        it('sets the value of a message property using a nested property', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"lookup[msg.topic]","tot":"msg"}],"action":"","property":"","from":"","to":"","reg":false,"wires":[["helperNode1"]]},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.payload.should.equal(2);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.receive({payload:"",lookup:{a:1,b:2},topic:"b"});
+            });
+        });
+
+        it('sets the value of a nested message property using a message property', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","name":"","rules":[{"t":"set","p":"lookup[msg.topic]","pt":"msg","to":"payload","tot":"msg"}],"action":"","property":"","from":"","to":"","reg":false,"wires":[["helperNode1"]]},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.lookup.b.should.equal("newValue");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                var msg = {
+                    payload: "newValue",
+                    lookup:{a:1,b:2},
+                    topic:"b"
+                }
+                changeNode1.receive(msg);
+            });
+        });
+
+        it('sets the value of a message property using a nested property in flow context', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"lookup[msg.topic]","tot":"flow"}],"action":"","property":"","from":"","to":"","reg":false,"wires":[["helperNode1"]],"z":"flow"},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.payload.should.eql(2);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.context().flow.set("lookup",{a:1, b:2});
+                changeNode1.receive({payload: "", topic: "b"});
+            });
+        })
+
+        it('sets the value of a message property using a nested property in flow context', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","name":"","rules":[{"t":"set","p":"payload","pt":"msg","to":"lookup[msg.topic]","tot":"flow"}],"action":"","property":"","from":"","to":"","reg":false,"wires":[["helperNode1"]],"z":"flow"},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.payload.should.eql(2);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.context().flow.set("lookup",{a:1, b:2});
+                changeNode1.receive({payload: "", topic: "b"});
+            });
+        })
+
+        it('sets the value of a nested flow context property using a message property', function(done) {
+            var flow = [{"id":"changeNode1","type":"change","name":"","rules":[{"t":"set","p":"lookup[msg.topic]","pt":"flow","to":"payload","tot":"msg"}],"action":"","property":"","from":"","to":"","reg":false,"wires":[["helperNode1"]],"z":"flow"},
+                        {id:"helperNode1", type:"helper", wires:[]}];
+
+            helper.load(changeNode, flow, function() {
+                var changeNode1 = helper.getNode("changeNode1");
+                var helperNode1 = helper.getNode("helperNode1");
+                helperNode1.on("input", function(msg) {
+                    try {
+                        msg.payload.should.eql("newValue");
+                        changeNode1.context().flow.get("lookup.b").should.eql("newValue");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                changeNode1.context().flow.set("lookup",{a:1, b:2});
+                changeNode1.receive({payload: "newValue", topic: "b"});
+            });
+        })
+
+
     });
     describe('#change', function() {
         it('changes the value of the message property', function(done) {
diff --git a/test/nodes/core/function/89-delay_spec.js b/test/nodes/core/function/89-delay_spec.js
index 51583d8a4..6a5a3c25f 100644
--- a/test/nodes/core/function/89-delay_spec.js
+++ b/test/nodes/core/function/89-delay_spec.js
@@ -719,4 +719,95 @@ describe('delay Node', function() {
             setImmediate( function() { delayNode1.receive({reset:true});  });          // reset the queue
         });
     });
+    
+    /* Messaging API support */
+    function mapiDoneTestHelper(done, pauseType, drop, msgAndTimings) {
+        const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+        const flow = [{id:"delayNode1",type:"delay",name:"delayNode", pauseType:pauseType, timeout:"1", timeoutUnits: "seconds",
+                       rate: "1", nbRateUnits: "1", rateUnits: "second", randomFirst:"950", randomLast:"1050",randomUnits:"milliseconds",
+                       drop: drop, wires: [[]]},
+                      {id:"completeNode1",type:"complete",scope: ["delayNode1"],uncaught:false,wires:[["helperNode1"]]},
+                      {id:"helperNode1",type:"helper", wires:[[]]}];
+        const numMsgs = msgAndTimings.length;
+        helper.load([delayNode, completeNode], flow, function () {
+            const delayNode1 = helper.getNode("delayNode1");
+            const helperNode1 = helper.getNode("helperNode1");
+            const t = Date.now();
+            let c = 0;
+            helperNode1.on("input", function (msg) {
+                msg.should.have.a.property('payload', msgAndTimings[c].msg.payload);
+                (Date.now() - t).should.be.approximately(msgAndTimings[c].avr, msgAndTimings[c].var);
+                c += 1;
+                if ( c === numMsgs) {
+                    done();
+                }
+            });
+            for (let i = 0; i < numMsgs; i++) {
+                setImmediate( function() { delayNode1.receive(msgAndTimings[i].msg); } );
+            }
+        });
+    }
+    
+    it('calls done when queued message is emitted (type: delay)', function(done) {
+        mapiDoneTestHelper(done, "delay", false, [{msg:{payload:1}, avr:1000, var:100}]);
+    });
+    it('calls done when queued message is emitted (type: delayv)', function(done) {
+        mapiDoneTestHelper(done, "delayv", false, [{msg:{payload:1, delay:1000}, avr:1000, var:100}]);
+    });
+    it('calls done when queued message is emitted (type: delay)', function(done) {
+        mapiDoneTestHelper(done, "random", false, [{msg:{payload:1}, avr:1000, var:100}]);
+    });
+    it('calls done when queued message is cleared (type: delay)', function(done) {
+        mapiDoneTestHelper(done, "delay", false, [{msg:{payload:1}, avr:100, var:100},
+                                                  {msg:{payload:2,reset:true}, avr:100, var:100}]);
+    });
+    it('calls done when queued message is cleared (type: delayv)', function(done) {
+        mapiDoneTestHelper(done, "delayv", false, [{msg:{payload:1, delay:1000}, avr:100, var:100},
+                                                   {msg:{payload:2, reset:true}, avr:100, var:100}]);
+    });
+    it('calls done when queued message is cleared (type: random)', function(done) {
+        mapiDoneTestHelper(done, "random", false, [{msg:{payload:1}, avr:100, var:100},
+                                                   {msg:{payload:2,reset:true}, avr:100, var:100}]);
+    });
+    it('calls done when queued message is flushed (type: delay)', function(done) {
+        mapiDoneTestHelper(done, "delay", false, [{msg:{payload:1}, avr:100, var:100},
+                                                  {msg:{payload:2,flush:true}, avr:100, var:100}]);
+    });
+    it('calls done when queued message is flushed (type: delayv)', function(done) {
+        mapiDoneTestHelper(done, "delayv", false, [{msg:{payload:1, delay:1000}, avr:100, var:100},
+                                                   {msg:{payload:2, flush:true}, avr:100, var:100}]);
+    });
+    it('calls done when queued message is flushed (type: random)', function(done) {
+        mapiDoneTestHelper(done, "random", false, [{msg:{payload:1}, avr:100, var:100},
+                                                  {msg:{payload:2,flush:true}, avr:100, var:100}]);
+    });
+    it('calls done when rated message is emitted (drop: false)', function(done) {
+        mapiDoneTestHelper(done, "rate", false, [{msg:{payload:1}, avr:0, var:100},
+                                                 {msg:{payload:2}, avr:1000, var:100}]);
+    });
+    it('calls done when rated message is emitted (drop: true)', function(done) {
+        mapiDoneTestHelper(done, "rate", true, [{msg:{payload:1}, avr:0, var:100},
+                                                {msg:{payload:2}, avr:0, var:100}]);
+    });
+    it('calls done when rated message is flushed', function(done) {
+        mapiDoneTestHelper(done, "rate", false, [{msg:{payload:1}, avr:0, var:100},
+                                                 {msg:{payload:2}, avr:0, var:100},
+                                                 {msg:{payload:3,flush:true}, avr:0, var:100}]);
+    });
+    it('calls done when queued messages are sent (queue)', function(done) {
+        mapiDoneTestHelper(done, "queue", false, [{msg:{payload:1,topic:"a"}, avr:500, var:700},
+                                                  {msg:{payload:2, topic:"b"}, avr:1500, var:700}]);
+    });
+    it('calls done when queued messages are sent (timed)', function(done) {
+        mapiDoneTestHelper(done, "timed", false, [{msg:{payload:1,topic:"a"}, avr:500, var:700},
+                                                  {msg:{payload:2,topic:"b"}, avr:500, var:700}]);
+    });
+    it('calls done when queue is reset (queue/timed)', function(done) {
+        mapiDoneTestHelper(done, "timed", false, [{msg:{payload:1,topic:"a"}, avr:0, var:500},
+                                                  {msg:{payload:2,reset:true}, avr:0, var:500}]);
+    });   
+    it('calls done when queue is flushed (queue/timed)', function(done) {
+        mapiDoneTestHelper(done, "timed", false, [{msg:{payload:1,topic:"a"}, avr:0, var:500},
+                                                  {msg:{payload:2,flush:true}, avr:0, var:500}]);
+    });
 });
diff --git a/test/nodes/core/function/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js
index dd77b37d9..ed25789a7 100644
--- a/test/nodes/core/function/89-trigger_spec.js
+++ b/test/nodes/core/function/89-trigger_spec.js
@@ -1154,5 +1154,45 @@ describe('trigger node', function() {
             },180);
         });
     });
-
+    describe('messaging API', function () {
+        function mapiDoneTriggerTestHelper(done, nodeSetting, msgAndTimings) {
+            const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+            const catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
+            const flow = [
+                { ...nodeSetting, id: "triggerNode1", type: "trigger", wires: [[]] },
+                { id: "completeNode1", type: "complete", scope: ["triggerNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "catchNode1", type: "catch", scope: ["triggerNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "helperNode1", type: "helper", wires: [[]] }];
+            const numMsgs = msgAndTimings.length;
+            helper.load([triggerNode, completeNode, catchNode], flow, function () {
+                const triggerNode1 = helper.getNode("triggerNode1");
+                const helperNode1 = helper.getNode("helperNode1");
+                RED.settings.nodeMessageBufferMaxLength = 3;
+                const t = Date.now();
+                let c = 0;
+                helperNode1.on("input", function (msg) {
+                    msg.should.have.a.property('payload');
+                    (Date.now() - t).should.be.approximately(msgAndTimings[msg.seq].avr, msgAndTimings[msg.seq].var);
+                    c += 1;
+                    if (c === numMsgs) {
+                        done();
+                    }
+                });
+                for (let i = 0; i < numMsgs; i++) {
+                    setTimeout(function () { triggerNode1.receive(msgAndTimings[i].msg); }, msgAndTimings[i].delay);
+                }
+            });
+        }
+        it('should call done() when first message has been processed', function (done) {
+            // not when second and more messages are emitted.
+            mapiDoneTriggerTestHelper(done, { units:"s", duration:"1" }, [
+                { msg: { seq: 0, payload: "A"}, delay: 0, avr: 0, var: 100}
+            ]);
+        });
+        it('should call done() when it receives reset message', function (done) {
+            mapiDoneTriggerTestHelper(done, {units:"s", duration:"1"}, [
+                {msg: { seq: 0, payload: "A", reset:true}, delay: 0, avr: 0, var:100}
+            ]);
+        })
+    });
 });
diff --git a/test/nodes/core/network/21-httprequest_spec.js b/test/nodes/core/network/21-httprequest_spec.js
index ab9020a64..e9792dd54 100644
--- a/test/nodes/core/network/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  **/
 
-var when = require("when");
 var http = require("http");
 var https = require("https");
 var should = require("should");
diff --git a/test/nodes/core/network/22-websocket_spec.js b/test/nodes/core/network/22-websocket_spec.js
index e13b513c8..995248279 100644
--- a/test/nodes/core/network/22-websocket_spec.js
+++ b/test/nodes/core/network/22-websocket_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var ws = require("ws");
-var when = require("when");
 var should = require("should");
 var helper = require("node-red-node-test-helper");
 var websocketNode = require("nr-test-utils").require("@node-red/nodes/core/network/22-websocket.js");
@@ -27,7 +26,7 @@ function getWsUrl(path) {
 }
 
 function createClient(listenerid) {
-    return when.promise(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var node = helper.getNode(listenerid);
         var url = getWsUrl(node.path);
         var sock = new ws(url);
@@ -300,23 +299,33 @@ describe('websocket Node', function() {
                 { id: "n2", type: "websocket out", server: "n1" },
                 { id: "n3", type: "helper", wires: [["n2"]] }];
             helper.load(websocketNode, flow, function() {
-                var def1 = when.defer(),
-                    def2 = when.defer();
-                when.all([createClient("n1"), createClient("n1")]).then(function(socks) {
-                    socks[0].on("message", function(msg, flags) {
-                        msg.should.equal("hello");
-                        def1.resolve();
-                    });
-                    socks[1].on("message", function(msg, flags) {
-                        msg.should.equal("hello");
-                        def2.resolve();
-                    });
+                Promise.all([createClient("n1"), createClient("n1")]).then(function(socks) {
+                    var promises = [
+                        new Promise((resolve,reject) => {
+                            socks[0].on("message", function(msg, flags) {
+                                try {
+                                    msg.should.equal("hello");
+                                    resolve();
+                                } catch(err) {
+                                    reject(err);
+                                }
+                            });
+                        }),
+                        new Promise((resolve,reject) => {
+                            socks[1].on("message", function(msg, flags) {
+                                try {
+                                    msg.should.equal("hello");
+                                    resolve();
+                                } catch(err) {
+                                    reject(err);
+                                }
+                            });
+                        })
+                    ];
                     helper.getNode("n3").send({
                         payload: "hello"
                     });
-                    return when.all([def1.promise, def2.promise]).then(function() {
-                        done();
-                    });
+                    return Promise.all(promises).then(() => {done()});
                 }).catch(function(err) {
                     done(err);
                 });
diff --git a/test/nodes/core/parsers/70-CSV_spec.js b/test/nodes/core/parsers/70-CSV_spec.js
index 17cbb9dc1..4c0d6f00b 100644
--- a/test/nodes/core/parsers/70-CSV_spec.js
+++ b/test/nodes/core/parsers/70-CSV_spec.js
@@ -18,6 +18,7 @@
 var should = require("should");
 var csvNode = require("nr-test-utils").require("@node-red/nodes/core/parsers/70-CSV.js");
 var helper = require("node-red-node-test-helper");
+const { c } = require("tar");
 
 describe('CSV node', function() {
 
@@ -136,6 +137,40 @@ describe('CSV node', function() {
             });
         });
 
+        it('should allow commas and spaces in the template', function(done) {
+            var flow = [ { id:"n1", type:"csv", temp:"a,b b,\"c,c\",\" d, d \"", wires:[["n2"]] },
+                {id:"n2", type:"helper"} ];
+            helper.load(csvNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    msg.should.have.property('payload', { a: 1, "b b":2, "c,c":3, "d, d": 4 });
+                    msg.should.have.property('columns', 'a,b b,"c,c","d, d"');
+                    check_parts(msg, 0, 1);
+                    done();
+                });
+                var testString = "1,2,3,4"+String.fromCharCode(10);
+                n1.emit("input", {payload:testString});
+            });
+        });
+
+        it('should allow passing in a tempalte as first line of CSV', function(done) {
+            var flow = [ { id:"n1", type:"csv", temp:"", hdrin:true, wires:[["n2"]] },
+                {id:"n2", type:"helper"} ];
+            helper.load(csvNode, flow, function() {
+                var n1 = helper.getNode("n1");
+                var n2 = helper.getNode("n2");
+                n2.on("input", function(msg) {
+                    msg.should.have.property('payload', { a: 1, "b b":2, "c,c":3, "d, d": 4 });
+                    msg.should.have.property('columns', 'a,b b,"c,c","d, d"');
+                    check_parts(msg, 0, 1);
+                    done();
+                });
+                var testString = 'a,b b,"c,c"," d, d "'+"\n"+"1,2,3,4"+String.fromCharCode(10);
+                n1.emit("input", {payload:testString});
+            });
+        });
+
         it('should leave numbers starting with 0, e and + as strings (except 0.)', function(done) {
             var flow = [ { id:"n1", type:"csv", temp:"a,b,c,d,e,f,g", wires:[["n2"]] },
                 {id:"n2", type:"helper"} ];
@@ -773,4 +808,43 @@ describe('CSV node', function() {
         });
     });
 
+    it('should call done when message processing is completed', function(done) {
+        const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+        const flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[[]]},
+                       { id:"c1", type:"complete", scope: ["n1"], uncaught:false, wires:[["h1"]]},
+                       { id:"h1", type:"helper", wires:[[]]} ];
+        helper.load([csvNode,completeNode], flow, function() {
+            const n1 = helper.getNode("n1");
+            const h1 = helper.getNode("h1");
+            h1.on("input", function(msg) {
+                try {
+                    msg.should.have.a.property('payload', "1,2,3,4");
+                    done();
+                } catch (e) {
+                    done(e);
+                }
+            });
+            n1.receive({payload:"1,2,3,4"});
+        });
+    });
+
+    it('should call done when input causes an error', function(done) {
+        const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+        const flow = [ { id:"n1", type:"csv", temp:"a,b,c,d", wires:[[]]},
+                       { id:"c1", type:"complete", scope: ["n1"], uncaught:false, wires:[["h1"]]},
+                       { id:"h1", type:"helper", wires:[[]]} ];
+        helper.load([csvNode,completeNode], flow, function() {
+            const n1 = helper.getNode("n1");
+            const h1 = helper.getNode("h1");
+            h1.on("input", function(msg) {
+                try {
+                    msg.should.have.a.property('payload', 1);
+                    done();
+                } catch (e) {
+                    done(e);
+                }
+            });
+            n1.receive({payload:1}); // neither object nor string
+        });
+    });
 });
diff --git a/test/nodes/core/sequence/17-split_spec.js b/test/nodes/core/sequence/17-split_spec.js
index 2c45f0e02..a216be90b 100644
--- a/test/nodes/core/sequence/17-split_spec.js
+++ b/test/nodes/core/sequence/17-split_spec.js
@@ -1646,4 +1646,179 @@ describe('JOIN node', function() {
         });
     });
 
+    describe('messaging API', function() {
+        function mapiDoneSplitTestHelper(done, splt, spltType, stream, msgAndTimings) {
+            const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+            const catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
+            const flow = [
+                { id: "splitNode1", type:"split", splt, spltType, stream, wires: [[]]},
+                { id: "completeNode1", type: "complete", scope: ["splitNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "catchNode1", type: "catch", scope: ["splitNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "helperNode1", type: "helper", wires: [[]] }];
+            const numMsgs = msgAndTimings.length;
+            helper.load([splitNode, completeNode, catchNode], flow, function () {
+                const splitNode1 = helper.getNode("splitNode1");
+                const helperNode1 = helper.getNode("helperNode1");
+                RED.settings.nodeMessageBufferMaxLength = 2;
+                const t = Date.now();
+                let c = 0;
+                helperNode1.on("input", function (msg) {
+                    msg.should.have.a.property('payload');
+                    (Date.now() - t).should.be.approximately(msgAndTimings[msg.seq].avr, msgAndTimings[msg.seq].var);
+                    c += 1;
+                    if (c === numMsgs) {
+                        done();
+                    }
+                });
+                for (let i = 0; i < numMsgs; i++) {
+                    setTimeout(function () { splitNode1.receive(msgAndTimings[i].msg); }, msgAndTimings[i].delay);
+                }
+            });
+        }
+        it('should call done() when message is sent (string)', function (done) {
+            mapiDoneSplitTestHelper(done, 2, "len", false, [
+                { msg: { seq: 0, payload: "12345" }, delay: 0, avr: 0, var: 100 },
+            ]);
+        });
+        it('should call done() when message is sent (array)', function (done) {
+            mapiDoneSplitTestHelper(done, 2, "len", false, [
+                { msg: { seq: 0, payload: [0,1,2,3,4] }, delay: 0, avr: 0, var: 100 },
+            ]);
+        });
+        it('should call done() when message is sent (object)', function (done) {
+            mapiDoneSplitTestHelper(done, 2, "len", false, [
+                { msg: { seq: 0, payload: {a:1,b:2}}, delay: 0, avr: 0, var: 100 },
+            ]);
+        });
+        it('should call done() when consolidated message is emitted (string, len)', function (done) {
+            mapiDoneSplitTestHelper(done, 5, "len", true, [
+                { msg: { seq: 0, payload: "12"}, delay: 0, avr: 500, var: 100 },
+                { msg: { seq: 1, payload: "34"}, delay: 200, avr: 500, var: 100 },
+                { msg: { seq: 2, payload: "5"},  delay: 500, avr: 500, var: 100 }
+            ]);
+        });
+        it('should call done() when consolidated message is emitted (Buffer, len)', function (done) {
+            mapiDoneSplitTestHelper(done, 5, "len", true, [
+                { msg: { seq: 0, payload: Buffer.from("12")}, delay: 0, avr: 500, var: 100 },
+                { msg: { seq: 1, payload: Buffer.from("34")}, delay: 200, avr: 500, var: 100 },
+                { msg: { seq: 2, payload: Buffer.from("5")},  delay: 500, avr: 500, var: 100 }
+            ]);
+        });
+        it('should call done() when consolidated message is emitted (Buffer, str)', function (done) {
+            mapiDoneSplitTestHelper(done, "5", "str", true, [
+                { msg: { seq: 0, payload: Buffer.from("12")}, delay: 0, avr: 500, var: 100 },
+                { msg: { seq: 1, payload: Buffer.from("34")}, delay: 200, avr: 500, var: 100 },
+                { msg: { seq: 2, payload: Buffer.from("5")},  delay: 500, avr: 500, var: 100 }
+            ]);
+        });
+        it('should call done() when consolidated message is emitted (Buffer, bin)', function (done) {
+            mapiDoneSplitTestHelper(done, "[53]", "bin", true, [
+                { msg: { seq: 0, payload: Buffer.from("12")}, delay: 0, avr: 500, var: 100 },
+                { msg: { seq: 1, payload: Buffer.from("34")}, delay: 200, avr: 500, var: 100 },
+                { msg: { seq: 2, payload: Buffer.from("5")},  delay: 500, avr: 500, var: 100 }
+            ]);
+        });
+
+        function mapiDoneJoinTestHelper(done, joinNodeSetting, msgAndTimings) {
+            const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+            const catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
+            const flow = [
+                { ...joinNodeSetting, id: "joinNode1", type:"join", wires: [[]]},
+                { id: "completeNode1", type: "complete", scope: ["joinNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "catchNode1", type: "catch", scope: ["joinNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "helperNode1", type: "helper", wires: [[]] }];
+            const numMsgs = msgAndTimings.length;
+            helper.load([joinNode, completeNode, catchNode], flow, function () {
+                const joinNode1 = helper.getNode("joinNode1");
+                const helperNode1 = helper.getNode("helperNode1");
+                RED.settings.nodeMessageBufferMaxLength = 3;
+                const t = Date.now();
+                let c = 0;
+                helperNode1.on("input", function (msg) {
+                    msg.should.have.a.property('payload');
+                    (Date.now() - t).should.be.approximately(msgAndTimings[msg.seq].avr, msgAndTimings[msg.seq].var);
+                    c += 1;
+                    if (c === numMsgs) {
+                        done();
+                    }
+                });
+                for (let i = 0; i < numMsgs; i++) {
+                    setTimeout(function () { joinNode1.receive(msgAndTimings[i].msg); }, msgAndTimings[i].delay);
+                }
+            });
+        }
+        it('should call done() when all messages are joined', function (done) {
+            mapiDoneJoinTestHelper(done, {mode:"auto", timeout:1}, [
+                { msg: {seq:0, payload:"A", parts:{id:1, type:"string", ch:",", index:0, count:3}}, delay:0, avr:500, var:100},
+                { msg: {seq:1, payload:"B", parts:{id:1, type:"string", ch:",", index:1, count:3}}, delay:200, avr:500, var:100},
+                { msg: {seq:2, payload:"C", parts:{id:1, type:"string", ch:",", index:2, count:3}}, delay:500, avr:500, var:100}
+            ]);
+        });
+        it('should call done() when the node is reset', function (done) {
+            mapiDoneJoinTestHelper(done, {mode:"auto", timeout:1}, [
+                { msg: {seq:0, payload:"A", parts:{id:1, type:"string", ch:",", index:0, count:3}}, delay:0, avr:500, var:100},
+                { msg: {seq:1, payload:"B", parts:{id:1, type:"string", ch:",", index:1, count:3}}, delay:200, avr:500, var:100},
+                { msg: {seq:2, payload:"dummy", reset: true, parts:{id:1}}, delay:500, avr:500, var:100}
+            ]);
+        });
+        it('should call done() when timed out', function (done) {
+            mapiDoneJoinTestHelper(done, {mode:"custom", joiner:",", build:"string", timeout:0.5}, [
+                { msg: {seq:0, payload:"A"}, delay:0, avr:500, var:100},
+                { msg: {seq:1, payload:"B"}, delay:200, avr:500, var:100},
+            ]);
+        });
+        it('should call done() when all messages are reduced', function (done) {
+            mapiDoneJoinTestHelper(done, {mode:"reduce", reduceRight:false, reduceExp:"$A+payload", reduceInit:"0",
+                                          reduceInitType:"num", reduceFixup:undefined}, [
+                { msg: {seq:0, payload:3, parts: {index:2, count:3, id:222}}, delay:0, avr:500, var:100},
+                { msg: {seq:1, payload:2, parts: {index:1, count:3, id:222}}, delay:200, avr:500, var:100},
+                { msg: {seq:2, payload:4, parts: {index:0, count:3, id:222}}, delay:500, avr:500, var:100}
+            ]);
+        });
+        it('should call done() regardless of buffer overflow', function (done) {
+            mapiDoneJoinTestHelper(done, {mode:"reduce", reduceRight:false, reduceExp:"$A+payload", reduceInit:"0",
+                                          reduceInitType:"num", reduceFixup:undefined}, [
+                { msg: {seq:0, payload:3, parts: {index:2, count:5, id:222}}, delay:0, avr:600, var:100},
+                { msg: {seq:1, payload:2, parts: {index:1, count:5, id:222}}, delay:200, avr:600, var:100},
+                { msg: {seq:2, payload:4, parts: {index:0, count:5, id:222}}, delay:400, avr:600, var:100},
+                { msg: {seq:3, payload:1, parts: {index:3, count:5, id:222}}, delay:600, avr:600, var:100},
+            ]);
+        });
+    });
+
+    it('should handle msg.parts even if messages are out of order in auto mode if exactly one message has count set', function (done) {
+        var flow = [{ id: "n1", type: "join", wires: [["n2"]], mode: "auto" },
+                { id: "n2", type: "helper" }];
+        helper.load(joinNode, flow, function () {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+
+            n2.on("input", function (msg) {
+                msg.payload.length.should.be.eql(5);
+                msg.payload.should.be.eql([0,1,2,3,4]);
+                done();
+            });
+
+            var msg = {};
+            msg.parts = {
+                id: RED.util.generateId()
+            };
+            for(var elem = 1; elem < 5; ++elem) {
+                var _msg = RED.util.cloneMessage(msg);
+                _msg.parts.index = elem;
+                if(elem == 4) {
+                    _msg.parts.count = 5;
+                }
+                _msg.payload = elem;
+                n1.receive(_msg);
+            }
+
+            var _msg = RED.util.cloneMessage(msg);
+            delete _msg.parts.count;
+            _msg.parts.index = 0;
+            _msg.payload = 0;
+            n1.receive(_msg);
+        });
+
+    })
 });
diff --git a/test/nodes/core/sequence/18-sort_spec.js b/test/nodes/core/sequence/18-sort_spec.js
index ac220216c..955038bfb 100644
--- a/test/nodes/core/sequence/18-sort_spec.js
+++ b/test/nodes/core/sequence/18-sort_spec.js
@@ -493,4 +493,62 @@ describe('SORT node', function() {
         });
     });
 
+    describe('messaging API', function() {
+        function mapiDoneTestHelper(done, targetType, msgAndTimings) {
+            const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+            const catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
+            const flow = [
+                {id: "sortNode1", type: "sort", order: "ascending", as_num: false, target: "payload", targetType,
+                 seqKey: "payload", seqKeyType: "msg", wires: [[]]},
+                { id: "completeNode1", type: "complete", scope: ["sortNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "catchNode1", type: "catch", scope: ["sortNode1"], uncaught: false, wires: [["helperNode1"]] },
+                { id: "helperNode1", type: "helper", wires: [[]] }];
+            const numMsgs = msgAndTimings.length;
+            helper.load([sortNode, completeNode, catchNode], flow, function () {
+                const sortNode1 = helper.getNode("sortNode1");
+                const helperNode1 = helper.getNode("helperNode1");
+                RED.settings.nodeMessageBufferMaxLength = 2;
+                const t = Date.now();
+                let c = 0;
+                helperNode1.on("input", function (msg) {
+                    msg.should.have.a.property('payload');
+                    (Date.now() - t).should.be.approximately(msgAndTimings[msg.seq].avr, msgAndTimings[msg.seq].var);
+                    c += 1;
+                    if (c === numMsgs) {
+                        done();
+                    }
+                });
+                for (let i = 0; i < numMsgs; i++) {
+                    setTimeout(function () { sortNode1.receive(msgAndTimings[i].msg); }, msgAndTimings[i].delay);
+                }
+            });
+        }
+        it('should call done() when message is sent (payload)', function (done) {
+            mapiDoneTestHelper(done, "msg", [
+                { msg: { seq: 0, payload: [1, 3, 2] }, delay: 0, avr: 0, var: 100 },
+            ]);
+        });
+        it('should call done() when message is sent (sequence)', function (done) {
+            mapiDoneTestHelper(done, "seq", [
+                { msg: { seq: 0, payload: 3, parts: {id:"A", index: 0, count: 2}}, delay: 0, avr: 500, var: 100 },
+                { msg: { seq: 1, payload: 2, parts: {id:"A", index: 1, count: 2}}, delay: 500, avr: 500, var: 100}
+            ]);
+        });
+        it('should call done() regardless of buffer overflow (same group)', function (done) {
+            mapiDoneTestHelper(done, "seq", [
+                { msg: { seq: 0, payload: 1, parts: {id:"A", index: 0, count: 3}}, delay: 0, avr: 1000, var: 100 },
+                { msg: { seq: 1, payload: 3, parts: {id:"A", index: 1, count: 3}}, delay: 500, avr: 1000, var: 100 },
+                { msg: { seq: 2, payload: 2, parts: {id:"A", index: 2, count: 3}}, delay: 1000, avr: 1000, var: 100 },
+            ]);
+        });
+        it('should call done() regardless of buffer overflow (different group)', function (done) {
+            mapiDoneTestHelper(done, "seq", [
+                { msg: { seq: 0, payload: 1, parts: {id:"A", index: 0, count: 2}}, delay: 0, avr: 1000, var: 100 },
+                { msg: { seq: 1, payload: 3, parts: {id:"B", index: 0, count: 2}}, delay: 500, avr: 1200, var: 100 },
+                { msg: { seq: 2, payload: 5, parts: {id:"C", index: 0, count: 2}}, delay: 1000, avr: 1500, var: 100 },
+                { msg: { seq: 3, payload: 2, parts: {id:"B", index: 1, count: 2}}, delay: 1200, avr: 1200, var: 100 },
+                { msg: { seq: 4, payload: 4, parts: {id:"C", index: 1, count: 2}}, delay: 1500, avr: 1500, var: 100 },                
+            ]);
+        });        
+    });
 });
diff --git a/test/nodes/core/sequence/19-batch_spec.js b/test/nodes/core/sequence/19-batch_spec.js
index b2e1e6de2..2ebcb8d4d 100644
--- a/test/nodes/core/sequence/19-batch_spec.js
+++ b/test/nodes/core/sequence/19-batch_spec.js
@@ -451,4 +451,92 @@ describe('BATCH node', function() {
         });
     });
 
+    describe('messaging API', function() {
+        function mapiDoneTestHelper(done, mode, count, overlap, interval, allowEmptySequence, msgAndTimings) {
+            const completeNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+            const catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/25-catch.js");
+            const flow = [{id:"batchNode1", type:"batch", name: "BatchNode", mode, count, overlap, interval, 
+                           allowEmptySequence, topics: [{topic: "TA"}], wires:[[]]},
+                          {id:"completeNode1",type:"complete",scope: ["batchNode1"],uncaught:false,wires:[["helperNode1"]]},
+                          {id:"catchNode1", type:"catch",scope: ["batchNode1"],uncaught:false,wires:[["helperNode1"]]},
+                          {id:"helperNode1",type:"helper", wires:[[]]}];
+            const numMsgs = msgAndTimings.length;
+            helper.load([batchNode, completeNode, catchNode], flow, function () {
+                const batchNode1 = helper.getNode("batchNode1");
+                const helperNode1 = helper.getNode("helperNode1");
+                RED.settings.nodeMessageBufferMaxLength = 2;
+                const t = Date.now();
+                let c = 0;
+                helperNode1.on("input", function (msg) {
+                    msg.should.have.a.property('payload');
+                    (Date.now() - t).should.be.approximately(msgAndTimings[msg.payload].avr, msgAndTimings[msg.payload].var);
+                    c += 1;
+                    if ( c === numMsgs) {
+                        done();
+                    }
+                });
+                for (let i = 0; i < numMsgs; i++) {
+                    setTimeout( function() { batchNode1.receive(msgAndTimings[i].msg); }, msgAndTimings[i].delay);
+                }
+            });
+        }
+
+        it('should call done() when message is sent (mode: count)', function(done) {
+            mapiDoneTestHelper(done, "count", 2, 0, 2, false, [ 
+                { msg: {payload: 0}, delay: 0, avr: 0, var: 100},
+                { msg: {payload: 1}, delay: 0, avr: 0, var: 100}
+            ]);
+        });
+        it('should call done() when reset (mode: count)', function(done) {
+            mapiDoneTestHelper(done, "count", 2, 0, 2, false, [ 
+                { msg: {payload: 0}, delay: 0, avr: 200, var: 100},
+                { msg: {payload: 1, reset:true}, delay: 200, avr: 200, var: 100}
+            ]);
+        });
+        it('should call done() regardless of buffer overflow (mode: count)', function(done) {
+            mapiDoneTestHelper(done, "count", 10, 0, 2, false, [
+                { msg: {payload: 0}, delay: 0, avr: 500, var: 100},
+                { msg: {payload: 1}, delay: 100, avr: 500, var: 100},
+                { msg: {payload: 2}, delay: 500, avr: 500, var: 100}
+            ]);
+        });
+        it('should call done() when message is sent (mode: interval)', function(done) {
+            mapiDoneTestHelper(done, "interval", 2, 0, 2, false, [
+                { msg: {payload: 0}, delay: 0, avr: 2000, var: 100},
+                { msg: {payload: 1}, delay: 500, avr: 2000, var: 100}
+            ]);
+        });
+        it('should call done() when reset (mode: interval)', function(done) {
+            mapiDoneTestHelper(done, "interval", 2, 0, 2, false, [
+                { msg: {payload: 0}, delay: 0, avr: 200, var: 100},
+                { msg: {payload: 1, reset:true}, delay: 200, avr: 200, var: 100}
+            ]);
+        });
+        it('should call done() regardless of buffer overflow (mode: interval)', function(done) {
+            mapiDoneTestHelper(done, "interval", 2, 0, 2, false, [
+                { msg: {payload: 0}, delay: 0, avr: 500, var: 100},
+                { msg: {payload: 1}, delay: 100, avr: 500, var: 100},
+                { msg: {payload: 2}, delay: 500, avr: 500, var: 100}
+            ]);
+        });
+        it('should call done() when message is sent (mode: concat)', function(done) {
+            mapiDoneTestHelper(done, "concat", 2, 0, 2, false, [
+                { msg: {topic:"TA", payload: 0, parts: {id: "TA", index: 0, count: 2}}, delay: 0, avr: 1000, var: 100},
+                { msg: {topic:"TA", payload: 1, parts: {id: "TA", index: 1, count: 2}}, delay: 1000, avr: 1000, var: 100},
+            ]);
+        });
+        it('should call done() when reset (mode: concat)', function(done) {
+            mapiDoneTestHelper(done, "concat", 2, 0, 2, false, [
+                { msg: {topic:"TA", payload: 0, parts: {id: "TA", index: 0, count: 2}}, delay: 0, avr: 1000, var: 100},
+                { msg: {payload: 1, reset:true}, delay: 1000, avr: 1000, var: 100},
+            ]);
+        });
+        it('should call done() regardless of buffer overflow (mode: concat)', function(done) {
+            mapiDoneTestHelper(done, "concat", 2, 0, 2, false, [
+                { msg: {topic:"TA", payload: 0, parts: {id: "TA", index: 0, count: 3}}, delay: 0, avr: 1000, var: 100},
+                { msg: {topic:"TA", payload: 0, parts: {id: "TA", index: 1, count: 3}}, delay: 500, avr: 1000, var: 100},
+                { msg: {topic:"TA", payload: 0, parts: {id: "TA", index: 2, count: 3}}, delay: 1000, avr: 1000, var: 100}
+            ]);
+        });
+    });
 });
diff --git a/test/resources/plugin/test-plugin/locales/en-US/test-editor-plugin.json b/test/resources/plugin/test-plugin/locales/en-US/test-editor-plugin.json
new file mode 100644
index 000000000..e990e2ec1
--- /dev/null
+++ b/test/resources/plugin/test-plugin/locales/en-US/test-editor-plugin.json
@@ -0,0 +1,3 @@
+{
+    "plugin": "winning"
+}
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/package.json b/test/resources/plugin/test-plugin/package.json
new file mode 100644
index 000000000..1077042de
--- /dev/null
+++ b/test/resources/plugin/test-plugin/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "test-plugin",
+  "version": "1.0.0",
+  "description": "",
+  "node-red": {
+      "plugins": {
+          "test": "test.js",
+          "test-editor-plugin": "test-editor-plugin.html",
+          "test-runtime-plugin": "test-runtime-plugin.js"
+      }
+  }
+}
diff --git a/test/resources/plugin/test-plugin/test-editor-plugin.html b/test/resources/plugin/test-plugin/test-editor-plugin.html
new file mode 100644
index 000000000..177813526
--- /dev/null
+++ b/test/resources/plugin/test-plugin/test-editor-plugin.html
@@ -0,0 +1,9 @@
+<script type="text/javascript">
+    console.log("Loaded test-plugin/test-editor-plugin")
+    RED.plugins.registerPlugin("my-test-editor-only-plugin", {
+        type: "bar",
+        onadd: function() {
+            console.log("my-test-editor-only-plugin.onadd called")
+        }
+    })
+</script>
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/test-runtime-plugin.js b/test/resources/plugin/test-plugin/test-runtime-plugin.js
new file mode 100644
index 000000000..d9e3ff3c7
--- /dev/null
+++ b/test/resources/plugin/test-plugin/test-runtime-plugin.js
@@ -0,0 +1,10 @@
+module.exports = function(RED) {
+    console.log("Loaded test-plugin/test-runtime-plugin")
+
+    RED.plugins.registerPlugin("my-test-runtime-only-plugin", {
+        type: "bar",
+        onadd: function() {
+            console.log("my-test-runtime-only-plugin.onadd called")
+        }
+    })
+}
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/test.html b/test/resources/plugin/test-plugin/test.html
new file mode 100644
index 000000000..72d2979df
--- /dev/null
+++ b/test/resources/plugin/test-plugin/test.html
@@ -0,0 +1,4 @@
+<script type="text/javascript">
+    console.log("Loaded test-plugin/test")
+    // RED.plugins.registerPlugin("")
+</script>
\ No newline at end of file
diff --git a/test/resources/plugin/test-plugin/test.js b/test/resources/plugin/test-plugin/test.js
new file mode 100644
index 000000000..3a14fe9af
--- /dev/null
+++ b/test/resources/plugin/test-plugin/test.js
@@ -0,0 +1,13 @@
+module.exports = function(RED) {
+    console.log("Loaded test-plugin/test")
+
+    RED.plugins.registerPlugin("my-test-plugin", {
+        type: "foo",
+        onadd: function() {
+            console.log("my-test-plugin.onadd called")
+            RED.events.on("registry:plugin-added", function(id) {
+                console.log(`my-test-plugin: plugin-added event "${id}"`)
+            });
+        }
+    })
+}
\ No newline at end of file
diff --git a/test/resources/subflow/package/README.md b/test/resources/subflow/package/README.md
new file mode 100644
index 000000000..60f4a4679
--- /dev/null
+++ b/test/resources/subflow/package/README.md
@@ -0,0 +1,3 @@
+curl -H "Content-Type: application/json" --request POST  --data '{"url":"/Users/nol/code/node-red/node-red/test/resources/subflow/test-subflow-mod-1.0.0.tgz","module":"test-subflow-mod"}' http://localhost:1880/nodes
+
+curl --request DELETE http://localhost:1880/nodes/test-subflow-mod
diff --git a/test/resources/subflow/package/package.json b/test/resources/subflow/package/package.json
new file mode 100644
index 000000000..92ff33e2b
--- /dev/null
+++ b/test/resources/subflow/package/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "test-subflow-mod",
+  "version": "1.0.1",
+  "description": "",
+  "keywords": [],
+  "license": "ISC",
+  "node-red": {
+      "nodes": {
+          "test-subflow": "subflow.js"
+      },
+      "dependencies": [
+          "node-red-node-random"
+      ]
+  },
+  "dependencies": {
+      "node-red-node-random": "*"
+  }
+}
diff --git a/test/resources/subflow/package/subflow.js b/test/resources/subflow/package/subflow.js
new file mode 100644
index 000000000..beea43f94
--- /dev/null
+++ b/test/resources/subflow/package/subflow.js
@@ -0,0 +1,4 @@
+
+module.exports = function(RED) {
+    RED.nodes.registerSubflow(JSON.parse(require('fs').readFileSync(require("path").join(__dirname,"subflow.json"))))
+}
\ No newline at end of file
diff --git a/test/resources/subflow/package/subflow.json b/test/resources/subflow/package/subflow.json
new file mode 100644
index 000000000..e5c6b25ab
--- /dev/null
+++ b/test/resources/subflow/package/subflow.json
@@ -0,0 +1,268 @@
+{
+    "id": "caf258cc.4e2c48",
+    "type": "subflow",
+    "name": "Test Subflow",
+    "info":"This is my exportable module subflow\n\nI hope this shows as help!",
+    "category": "common",
+    "in": [
+        {
+            "x": 120,
+            "y": 100,
+            "wires": [
+                {
+                    "id": "2f1d674f.a02d28"
+                }
+            ]
+        }
+    ],
+    "out": [
+        {
+            "x": 560,
+            "y": 100,
+            "wires": [
+                {
+                    "id": "1497236e.07f12d",
+                    "port": 0
+                }
+            ]
+        },
+        {
+            "x": 360,
+            "y": 200,
+            "wires": [
+                {
+                    "id": "f4334f5f.4905c",
+                    "port": 0
+                }
+            ]
+        }
+    ],
+    "env": [
+        {
+            "name": "FOO",
+            "type": "cred",
+            "ui": {
+                "icon": "font-awesome/fa-thermometer-0"
+            }
+        },
+        {
+            "name": "BAR",
+            "type": "str",
+            "value": "1",
+            "ui": {
+                "icon": "font-awesome/fa-thermometer-2",
+                "type": "select",
+                "opts": {
+                    "opts": [
+                        {
+                            "l": {
+                                "en-US": "option 1"
+                            },
+                            "v": "1"
+                        },
+                        {
+                            "l": {
+                                "en-US": "option 2"
+                            },
+                            "v": "2"
+                        },
+                        {
+                            "l": {
+                                "en-US": "option 3"
+                            },
+                            "v": "3"
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            "name": "onewithaverylongname",
+            "type": "str",
+            "value": ""
+        },
+        {
+            "name": "BARRY",
+            "type": "bool",
+            "value": "true",
+            "ui": {
+                "icon": "font-awesome/fa-thermometer-4",
+                "type": "checkbox"
+            }
+        },
+        {
+            "name": "WILMA",
+            "type": "num",
+            "value": "10",
+            "ui": {
+                "icon": "font-awesome/fbomb",
+                "type": "spinner"
+            }
+        },
+        {
+            "name": "awg",
+            "type": "num",
+            "value": "",
+            "ui": {
+                "icon": "font-awesome/fa-address-book-o",
+                "type": "spinner"
+            }
+        },
+        {
+            "name": "awf",
+            "type": "str",
+            "value": "",
+            "ui": {
+                "type": "select",
+                "opts": {
+                    "opts": [
+                        {
+                            "l": {
+                                "en-US": "one"
+                            },
+                            "v": "1"
+                        },
+                        {
+                            "l": {
+                                "en-US": "two"
+                            },
+                            "v": "2"
+                        },
+                        {
+                            "l": {
+                                "en-US": "three"
+                            },
+                            "v": "3"
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            "name": "aawf",
+            "type": "bool",
+            "value": "true",
+            "ui": {
+                "type": "checkbox"
+            }
+        },
+        {
+            "name": "awgawgawg",
+            "type": "str",
+            "value": "",
+            "ui": {
+                "type": "none"
+            }
+        },
+        {
+            "name": "seagseg",
+            "type": "str",
+            "value": "",
+            "ui": {
+                "type": "hide"
+            }
+        }
+    ],
+    "meta": {
+        "type": "fly-a-plane"
+    },
+    "color": "#A6BBCF",
+    "icon": "font-awesome/fa-space-shuttle",
+    "status": {
+        "x": 500,
+        "y": 300,
+        "wires": [
+            {
+                "id": "8252d1cc.54f94",
+                "port": 0
+            }
+        ]
+    },
+    "flow": [
+        {
+            "id": "2f1d674f.a02d28",
+            "type": "function",
+            "z": "caf258cc.4e2c48",
+            "name": "",
+            "func": "node.error(\"subflow error \"+msg.payload,msg);\nmsg.payload = {\n    FOO: env.get(\"FOO\"),\n    BAR: env.get(\"BAR\"),\n    WILMA: env.get(\"WILMA\"),\n    BARRY: env.get(\"BARRY\")\n}\nnode.warn(\"warning\");\n\nreturn msg;",
+            "outputs": 1,
+            "noerr": 0,
+            "initialize": "",
+            "finalize": "",
+            "x": 240,
+            "y": 100,
+            "wires": [
+                [
+                    "1497236e.07f12d"
+                ]
+            ]
+        },
+        {
+            "id": "f4334f5f.4905c",
+            "type": "catch",
+            "z": "caf258cc.4e2c48",
+            "name": "",
+            "scope": null,
+            "uncaught": false,
+            "x": 220,
+            "y": 200,
+            "wires": [
+                [
+                    "8252d1cc.54f94"
+                ]
+            ]
+        },
+        {
+            "id": "8252d1cc.54f94",
+            "type": "change",
+            "z": "caf258cc.4e2c48",
+            "name": "",
+            "rules": [
+                {
+                    "t": "set",
+                    "p": "payload",
+                    "pt": "msg",
+                    "to": "error.message",
+                    "tot": "msg"
+                }
+            ],
+            "action": "",
+            "property": "",
+            "from": "",
+            "to": "",
+            "reg": false,
+            "x": 350,
+            "y": 300,
+            "wires": [
+                []
+            ]
+        },
+        {
+            "id": "1497236e.07f12d",
+            "type": "random",
+            "z": "caf258cc.4e2c48",
+            "name": "",
+            "low": "1",
+            "high": "10",
+            "inte": "true",
+            "property": "random",
+            "x": 420,
+            "y": 100,
+            "wires": [
+                []
+            ]
+        },
+        {
+            "id": "876fc49e.f15268",
+            "type": "subflow:caf258cc.4e2c48",
+            "z": "d607ce33.4fa5a",
+            "name": "",
+            "x": 200,
+            "y": 760,
+            "wires": [
+                [],
+                []
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/test/resources/subflow/test-subflow-mod-1.0.1.tgz b/test/resources/subflow/test-subflow-mod-1.0.1.tgz
new file mode 100644
index 000000000..daa53b77a
Binary files /dev/null and b/test/resources/subflow/test-subflow-mod-1.0.1.tgz differ
diff --git a/test/unit/@node-red/editor-api/lib/admin/flow_spec.js b/test/unit/@node-red/editor-api/lib/admin/flow_spec.js
index 278c6a3f3..807fc8fb9 100644
--- a/test/unit/@node-red/editor-api/lib/admin/flow_spec.js
+++ b/test/unit/@node-red/editor-api/lib/admin/flow_spec.js
@@ -19,7 +19,6 @@ var request = require('supertest');
 var express = require('express');
 var bodyParser = require('body-parser');
 var sinon = require('sinon');
-var when = require('when');
 
 var NR_TEST_UTILS = require("nr-test-utils");
 
diff --git a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
index f921d907d..872f76e23 100644
--- a/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
+++ b/test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
@@ -19,7 +19,6 @@ var request = require('supertest');
 var express = require('express');
 var bodyParser = require('body-parser');
 var sinon = require('sinon');
-var when = require('when');
 
 var NR_TEST_UTILS = require("nr-test-utils");
 
diff --git a/test/unit/@node-red/editor-api/lib/admin/plugins_spec.js b/test/unit/@node-red/editor-api/lib/admin/plugins_spec.js
new file mode 100644
index 000000000..74584a1d8
--- /dev/null
+++ b/test/unit/@node-red/editor-api/lib/admin/plugins_spec.js
@@ -0,0 +1,111 @@
+const should = require("should");
+const request = require('supertest');
+const express = require('express');
+const bodyParser = require("body-parser");
+
+var app;
+
+var NR_TEST_UTILS = require("nr-test-utils");
+
+var plugins = NR_TEST_UTILS.require("@node-red/editor-api/lib/admin/plugins");
+
+describe("api/editor/plugins", function() {
+    const pluginList = [
+        {
+            "id": "test-module/test-set",
+            "enabled": true,
+            "local": false,
+            "plugins": [
+                {
+                    "type": "foo",
+                    "id": "a-plugin",
+                    "module": "test-module"
+                },
+                {
+                    "type": "bar",
+                    "id": "a-plugin2",
+                    "module": "test-module"
+                },
+                {
+                    "type": "foo",
+                    "id": "a-plugin3",
+                    "module": "test-module"
+                }
+            ]
+        },
+        {
+            "id": "test-module/test-disabled-set",
+            "enabled": false,
+            "local": false,
+            "plugins": []
+        }
+    ];
+    const pluginConfigs = `
+<!-- --- [red-plugin:test-module/test-set] --- -->
+test-module-config`;
+
+    const pluginCatalogs = { "test-module": {"foo": "bar"}};
+
+    before(function() {
+        app = express();
+        app.use(bodyParser.json());
+        app.get("/plugins",plugins.getAll);
+        app.get("/plugins/messages",plugins.getCatalogs);
+
+        plugins.init({
+            plugins: {
+                getPluginList: async function() { return pluginList },
+                getPluginConfigs: async function() { return pluginConfigs },
+                getPluginCatalogs: async function() { return pluginCatalogs }
+            }
+        })
+    });
+
+    it('returns the list of plugins', function(done) {
+        request(app)
+        .get("/plugins")
+        .set('Accept', 'application/json')
+        .expect(200)
+        .end(function(err,res) {
+            if (err) {
+                return done(err);
+            }
+            try {
+                JSON.stringify(res.body).should.eql(JSON.stringify(pluginList));
+                done();
+            } catch(err) {
+                done(err)
+            }
+        });
+    });
+    it('returns the plugin configs', function(done) {
+        request(app)
+        .get("/plugins")
+        .set('Accept', 'text/html')
+        .expect(200)
+        .expect(pluginConfigs)
+        .end(function(err,res) {
+            if (err) {
+                return done(err);
+            }
+            done();
+        });
+    });
+    it('returns the plugin catalogs', function(done) {
+        request(app)
+        .get("/plugins/messages")
+        .set('Accept', 'application/json')
+        .expect(200)
+        .end(function(err,res) {
+            if (err) {
+                return done(err);
+            }
+            try {
+                JSON.stringify(res.body).should.eql(JSON.stringify(pluginCatalogs));
+                done();
+            } catch(err) {
+                done(err)
+            }
+        });
+    });
+});
diff --git a/test/unit/@node-red/editor-api/lib/auth/index_spec.js b/test/unit/@node-red/editor-api/lib/auth/index_spec.js
index 3cf0111d6..def2335a7 100644
--- a/test/unit/@node-red/editor-api/lib/auth/index_spec.js
+++ b/test/unit/@node-red/editor-api/lib/auth/index_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var should = require("should");
-var when = require("when");
 var sinon = require("sinon");
 
 var passport = require("passport");
@@ -60,7 +59,7 @@ describe("api/auth/index",function() {
     describe("revoke", function() {
         it("revokes a token", function(done) {
             var revokeToken = sinon.stub(Tokens,"revoke",function() {
-                return when.resolve();
+                return Promise.resolve();
             });
 
             var req = { body: { token: "abcdef" } };
diff --git a/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js b/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js
index 848aaf99d..d95d78db2 100644
--- a/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js
+++ b/test/unit/@node-red/editor-api/lib/auth/strategies_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var should = require("should");
-var when = require('when');
 var sinon = require('sinon');
 
 var NR_TEST_UTILS = require("nr-test-utils");
@@ -37,7 +36,7 @@ describe("api/auth/strategies", function() {
 
         it('Handles authentication failure',function(done) {
             userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
 
             strategies.passwordTokenExchange({},"user","password","scope",function(err,token) {
@@ -53,7 +52,7 @@ describe("api/auth/strategies", function() {
 
         it('Handles scope overreach',function(done) {
             userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
-                return when.resolve({username:"user",permissions:"read"});
+                return Promise.resolve({username:"user",permissions:"read"});
             });
 
             strategies.passwordTokenExchange({},"user","password","*",function(err,token) {
@@ -69,14 +68,14 @@ describe("api/auth/strategies", function() {
 
         it('Creates new token on authentication success',function(done) {
             userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
-                return when.resolve({username:"user",permissions:"*"});
+                return Promise.resolve({username:"user",permissions:"*"});
             });
             var tokenDetails = {};
             var tokenCreate = sinon.stub(Tokens,"create",function(username,client,scope) {
                 tokenDetails.username = username;
                 tokenDetails.client = client;
                 tokenDetails.scope = scope;
-                return when.resolve({accessToken: "123456"});
+                return Promise.resolve({accessToken: "123456"});
             });
 
             strategies.passwordTokenExchange({id:"myclient"},"user","password","read",function(err,token) {
@@ -100,7 +99,7 @@ describe("api/auth/strategies", function() {
     describe("Anonymous Strategy", function() {
         it('Succeeds if anon user enabled',function(done) {
             var userDefault = sinon.stub(Users,"default",function() {
-                return when.resolve("anon");
+                return Promise.resolve("anon");
             });
             strategies.anonymousStrategy._success = strategies.anonymousStrategy.success;
             strategies.anonymousStrategy.success = function(user) {
@@ -113,7 +112,7 @@ describe("api/auth/strategies", function() {
         });
         it('Fails if anon user not enabled',function(done) {
             var userDefault = sinon.stub(Users,"default",function() {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
             strategies.anonymousStrategy._fail = strategies.anonymousStrategy.fail;
             strategies.anonymousStrategy.fail = function(err) {
@@ -132,7 +131,7 @@ describe("api/auth/strategies", function() {
     describe("Tokens Strategy", function() {
         it('Succeeds if tokens user enabled custom header',function(done) {
             var userTokens = sinon.stub(Users,"tokens",function(token) {
-                return when.resolve("tokens-"+token);
+                return Promise.resolve("tokens-"+token);
             });
             var userTokenHeader = sinon.stub(Users,"tokenHeader",function(token) {
                 return "x-test-token";
@@ -148,7 +147,7 @@ describe("api/auth/strategies", function() {
         });
         it('Succeeds if tokens user enabled default header',function(done) {
             var userTokens = sinon.stub(Users,"tokens",function(token) {
-                return when.resolve("tokens-"+token);
+                return Promise.resolve("tokens-"+token);
             });
             var userTokenHeader = sinon.stub(Users,"tokenHeader",function(token) {
                 return "authorization";
@@ -164,7 +163,7 @@ describe("api/auth/strategies", function() {
         });
         it('Fails if tokens user not enabled',function(done) {
             var userTokens = sinon.stub(Users,"tokens",function() {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
             var userTokenHeader = sinon.stub(Users,"tokenHeader",function(token) {
                 return "authorization";
@@ -187,7 +186,7 @@ describe("api/auth/strategies", function() {
     describe("Bearer Strategy", function() {
         it('Rejects invalid token',function(done) {
             var getToken = sinon.stub(Tokens,"get",function(token) {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
 
             strategies.bearerStrategy("1234",function(err,user) {
@@ -204,10 +203,10 @@ describe("api/auth/strategies", function() {
         });
         it('Accepts valid token',function(done) {
             var getToken = sinon.stub(Tokens,"get",function(token) {
-                return when.resolve({user:"user",scope:"scope"});
+                return Promise.resolve({user:"user",scope:"scope"});
             });
             var getUser = sinon.stub(Users,"get",function(username) {
-                return when.resolve("aUser");
+                return Promise.resolve("aUser");
             });
 
             strategies.bearerStrategy("1234",function(err,user,opts) {
@@ -226,10 +225,10 @@ describe("api/auth/strategies", function() {
         });
         it('Fail if no user for token',function(done) {
             var getToken = sinon.stub(Tokens,"get",function(token) {
-                return when.resolve({user:"user",scope:"scope"});
+                return Promise.resolve({user:"user",scope:"scope"});
             });
             var getUser = sinon.stub(Users,"get",function(username) {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
 
             strategies.bearerStrategy("1234",function(err,user,opts) {
@@ -252,7 +251,7 @@ describe("api/auth/strategies", function() {
         it('Accepts valid client',function(done) {
             var testClient = {id:"node-red-editor",secret:"not_available"};
             var getClient = sinon.stub(Clients,"get",function(client) {
-                return when.resolve(testClient);
+                return Promise.resolve(testClient);
             });
 
             strategies.clientPasswordStrategy(testClient.id,testClient.secret,function(err,client) {
@@ -270,7 +269,7 @@ describe("api/auth/strategies", function() {
         it('Rejects invalid client secret',function(done) {
             var testClient = {id:"node-red-editor",secret:"not_available"};
             var getClient = sinon.stub(Clients,"get",function(client) {
-                return when.resolve(testClient);
+                return Promise.resolve(testClient);
             });
 
             strategies.clientPasswordStrategy(testClient.id,"invalid_secret",function(err,client) {
@@ -287,7 +286,7 @@ describe("api/auth/strategies", function() {
         });
         it('Rejects invalid client id',function(done) {
             var getClient = sinon.stub(Clients,"get",function(client) {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
             strategies.clientPasswordStrategy("invalid_id","invalid_secret",function(err,client) {
                 try {
@@ -305,7 +304,7 @@ describe("api/auth/strategies", function() {
         var userAuthentication;
         it('Blocks after 5 failures',function(done) {
             userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
-                return when.resolve(null);
+                return Promise.resolve(null);
             });
             for (var z=0; z<5; z++) {
                 strategies.passwordTokenExchange({},"user","badpassword","scope",function(err,token) {
diff --git a/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js b/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js
index 2b06932c7..9bb231eb5 100644
--- a/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js
+++ b/test/unit/@node-red/editor-api/lib/auth/tokens_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var should = require("should");
-var when = require("when");
 var sinon = require("sinon");
 
 var NR_TEST_UTILS = require("nr-test-utils");
@@ -35,7 +34,7 @@ describe("api/auth/tokens", function() {
         it('returns a valid token', function(done) {
             Tokens.init({},{
                 getSessions:function() {
-                    return when.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
+                    return Promise.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
                 }
             }).then(function() {
                 Tokens.get("1234").then(function(token) {
@@ -52,7 +51,7 @@ describe("api/auth/tokens", function() {
         it('returns null for an invalid token', function(done) {
             Tokens.init({},{
                 getSessions:function() {
-                    return when.resolve({});
+                    return Promise.resolve({});
                 }
             }).then(function() {
                 Tokens.get("1234").then(function(token) {
@@ -66,11 +65,11 @@ describe("api/auth/tokens", function() {
             });
         });
         it('returns null for an expired token', function(done) {
-            var saveSessions = sinon.stub().returns(when.resolve());
+            var saveSessions = sinon.stub().returns(Promise.resolve());
             var expiryTime = Date.now()+50;
             Tokens.init({},{
                 getSessions:function() {
-                    return when.resolve({"1234":{"user":"fred","expires":expiryTime}});
+                    return Promise.resolve({"1234":{"user":"fred","expires":expiryTime}});
                 },
                 saveSessions: saveSessions
             }).then(function() {
@@ -100,10 +99,10 @@ describe("api/auth/tokens", function() {
                 tokens: [{
                     token: "1234",
                     user: "fred",
-                }]    
+                }]
             },{
                 getSessions:function() {
-                    return when.resolve({});
+                    return Promise.resolve({});
                 }
             }).then(function() {
                 Tokens.get("1234").then(function(token) {
@@ -124,11 +123,11 @@ describe("api/auth/tokens", function() {
             var savedSession;
             Tokens.init({sessionExpiryTime: 10},{
                 getSessions:function() {
-                    return when.resolve({});
+                    return Promise.resolve({});
                 },
                 saveSessions:function(sess) {
                     savedSession = sess;
-                    return when.resolve();
+                    return Promise.resolve();
                 }
             });
             var expectedExpiryTime = Date.now()+10000;
@@ -159,11 +158,11 @@ describe("api/auth/tokens", function() {
             var savedSession;
             Tokens.init({},{
                 getSessions:function() {
-                    return when.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
+                    return Promise.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
                 },
                 saveSessions:function(sess) {
                     savedSession = sess;
-                    return when.resolve();
+                    return Promise.resolve();
                 }
             }).then(function() {
                 Tokens.revoke("1234").then(function() {
diff --git a/test/unit/@node-red/editor-api/lib/auth/users_spec.js b/test/unit/@node-red/editor-api/lib/auth/users_spec.js
index 18a179ac7..e07a35a03 100644
--- a/test/unit/@node-red/editor-api/lib/auth/users_spec.js
+++ b/test/unit/@node-red/editor-api/lib/auth/users_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var should = require("should");
-var when = require('when');
 var sinon = require('sinon');
 
 var NR_TEST_UTILS = require("nr-test-utils");
@@ -144,12 +143,12 @@ describe("api/auth/users", function() {
            Users.init({
                type:"credentials",
                users:function(username) {
-                   return when.resolve({'username':'dave','permissions':'read'});
+                   return Promise.resolve({'username':'dave','permissions':'read'});
                },
                authenticate: function(username,password) {
                    authUsername = username;
                    authPassword = password;
-                   return when.resolve({'username':'pete','permissions':'write'});
+                   return Promise.resolve({'username':'pete','permissions':'write'});
                }
            });
        });
diff --git a/test/unit/@node-red/editor-api/lib/editor/comms_spec.js b/test/unit/@node-red/editor-api/lib/editor/comms_spec.js
index 8f6f78315..06743e87e 100644
--- a/test/unit/@node-red/editor-api/lib/editor/comms_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/comms_spec.js
@@ -18,7 +18,6 @@ var should = require("should");
 var sinon = require("sinon");
 const stoppable = require('stoppable');
 
-var when = require("when");
 var http = require('http');
 var express = require('express');
 var app = express();
@@ -59,7 +58,7 @@ describe("api/editor/comms", function() {
         var url;
         var port;
         before(function(done) {
-            sinon.stub(Users,"default",function() { return when.resolve(null);});
+            sinon.stub(Users,"default",function() { return Promise.resolve(null);});
             server = stoppable(http.createServer(function(req,res){app(req,res)}));
             comms.init(server, {}, {comms: mockComms});
             server.listen(listenPort, address);
@@ -165,7 +164,7 @@ describe("api/editor/comms", function() {
         var url;
         var port;
         before(function(done) {
-            sinon.stub(Users,"default",function() { return when.resolve(null);});
+            sinon.stub(Users,"default",function() { return Promise.resolve(null);});
             server = stoppable(http.createServer(function(req,res){app(req,res)}));
             comms.init(server, {httpAdminRoot:"/adminPath"}, {comms: mockComms});
             server.listen(listenPort, address);
@@ -203,7 +202,7 @@ describe("api/editor/comms", function() {
         var url;
         var port;
         before(function(done) {
-            sinon.stub(Users,"default",function() { return when.resolve(null);});
+            sinon.stub(Users,"default",function() { return Promise.resolve(null);});
             server = stoppable(http.createServer(function(req,res){app(req,res)}));
             comms.init(server, {httpAdminRoot:"/adminPath/"}, {comms: mockComms});
             server.listen(listenPort, address);
@@ -241,7 +240,7 @@ describe("api/editor/comms", function() {
         var url;
         var port;
         before(function(done) {
-            sinon.stub(Users,"default",function() { return when.resolve(null);});
+            sinon.stub(Users,"default",function() { return Promise.resolve(null);});
             server = stoppable(http.createServer(function(req,res){app(req,res)}));
             comms.init(server, {httpAdminRoot:"adminPath"}, {comms: mockComms});
             server.listen(listenPort, address);
@@ -279,7 +278,7 @@ describe("api/editor/comms", function() {
         var url;
         var port;
         before(function(done) {
-            sinon.stub(Users,"default",function() { return when.resolve(null);});
+            sinon.stub(Users,"default",function() { return Promise.resolve(null);});
             server = stoppable(http.createServer(function(req,res){app(req,res)}));
             comms.init(server, {webSocketKeepAliveTime: 100}, {comms: mockComms});
             server.listen(listenPort, address);
@@ -345,28 +344,28 @@ describe("api/editor/comms", function() {
         var getToken;
         var getUserToken;
         before(function(done) {
-            getDefaultUser = sinon.stub(Users,"default",function() { return when.resolve(null);});
+            getDefaultUser = sinon.stub(Users,"default",function() { return Promise.resolve(null);});
             getUser = sinon.stub(Users,"get", function(username) {
                 if (username == "fred") {
-                    return when.resolve({permissions:"read"});
+                    return Promise.resolve({permissions:"read"});
                 } else {
-                    return when.resolve(null);
+                    return Promise.resolve(null);
                 }
             });
             getUserToken = sinon.stub(Users,"tokens", function(token) {
                 if (token == "abcde") {
-                    return when.resolve({user:"wilma", permissions:"*"})
+                    return Promise.resolve({user:"wilma", permissions:"*"})
                 } else {
-                    return when.resolve(null);
+                    return Promise.resolve(null);
                 }
             });
             getToken = sinon.stub(Tokens,"get",function(token) {
                 if (token == "1234") {
-                    return when.resolve({user:"fred",scope:["*"]});
+                    return Promise.resolve({user:"fred",scope:["*"]});
                 } else if (token == "5678") {
-                    return when.resolve({user:"barney",scope:["*"]});
+                    return Promise.resolve({user:"barney",scope:["*"]});
                 } else {
-                    return when.resolve(null);
+                    return Promise.resolve(null);
                 }
             });
 
@@ -484,7 +483,7 @@ describe("api/editor/comms", function() {
         var port;
         var getDefaultUser;
         before(function(done) {
-            getDefaultUser = sinon.stub(Users,"default",function() { return when.resolve({permissions:"read"});});
+            getDefaultUser = sinon.stub(Users,"default",function() { return Promise.resolve({permissions:"read"});});
             server = stoppable(http.createServer(function(req,res){app(req,res)}));
             comms.init(server, {adminAuth:{}}, {comms: mockComms});
             server.listen(listenPort, address);
diff --git a/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js b/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js
index 2fc1ea5a3..c5a6c74f8 100644
--- a/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/credentials_spec.js
@@ -18,7 +18,6 @@ var should = require("should");
 var request = require('supertest');
 var express = require('express');
 var sinon = require('sinon');
-var when = require('when');
 
 var NR_TEST_UTILS = require("nr-test-utils");
 
diff --git a/test/unit/@node-red/editor-api/lib/editor/index_spec.js b/test/unit/@node-red/editor-api/lib/editor/index_spec.js
index e45fcbdba..e142f8984 100644
--- a/test/unit/@node-red/editor-api/lib/editor/index_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/index_spec.js
@@ -28,10 +28,6 @@ var auth = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth");
 
 var log = NR_TEST_UTILS.require("@node-red/util").log;
 
-
-var when = require("when");
-
-
 describe("api/editor/index", function() {
     var app;
     describe("disabled the editor", function() {
diff --git a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
index 67e305f71..2fa43e01a 100644
--- a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
@@ -17,7 +17,6 @@
 var should = require("should");
 var express = require('express');
 var sinon = require('sinon');
-var when = require('when');
 var fs = require("fs");
 
 var app = express();
@@ -34,11 +33,11 @@ describe("api/editor/theme", function () {
         theme.init({settings: {}});
         fs.statSync.restore();
     });
-    it("applies the default theme", function () {
+    it("applies the default theme", async function () {
         var result = theme.init({});
         should.not.exist(result);
 
-        var context = theme.context();
+        var context = await theme.context();
         context.should.have.a.property("page");
         context.page.should.have.a.property("title", "Node-RED");
         context.page.should.have.a.property("favicon", "favicon.ico");
@@ -53,7 +52,7 @@ describe("api/editor/theme", function () {
         should.not.exist(theme.settings());
     });
 
-    it("picks up custom theme", function () {
+    it("picks up custom theme", async function () {
         theme.init({
             editorTheme: {
                 page: {
@@ -105,7 +104,7 @@ describe("api/editor/theme", function () {
 
         theme.app();
 
-        var context = theme.context();
+        var context = await theme.context();
         context.should.have.a.property("page");
         context.page.should.have.a.property("title", "Test Page Title");
         context.page.should.have.a.property("favicon", "theme/favicon/favicon");
@@ -143,4 +142,19 @@ describe("api/editor/theme", function () {
         settings.projects.should.have.a.property("enabled", false);
     });
 
+    it("test explicit userMenu set to true in theme setting", function () {
+      theme.init({
+          editorTheme: {
+              userMenu: true,
+          }
+      });
+
+      theme.app();
+
+      var settings = theme.settings();
+      settings.should.have.a.property("userMenu");
+      settings.userMenu.should.be.eql(true);
+
+    });
+
 });
diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js
index 1d5e9380b..28928181b 100644
--- a/test/unit/@node-red/editor-api/lib/index_spec.js
+++ b/test/unit/@node-red/editor-api/lib/index_spec.js
@@ -18,11 +18,9 @@ var should = require("should");
 var sinon = require("sinon");
 var request = require("supertest");
 var express = require("express");
-var when = require("when");
-var fs = require("fs");
-var path = require("path");
 
 var NR_TEST_UTILS = require("nr-test-utils");
+const auth = require("basic-auth");
 
 var api = NR_TEST_UTILS.require("@node-red/editor-api");
 
@@ -96,4 +94,89 @@ describe("api/index", function() {
             request(api.httpAdmin).get("/auth/login").expect(200).end(done)
         })
     });
+
+    describe('initialises api with admin middleware', function(done) {
+        it('ignores non-function values',function(done) {
+            api.init({ httpAdminRoot: true, httpAdminMiddleware: undefined },{},{},{});
+            const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'testMiddleware')
+            should(middlewareFound).be.empty();
+            done();
+        });
+
+        it('only accepts functions as middleware',function(done) {
+            const testMiddleware = function(req, res, next){ next(); };
+            api.init({ httpAdminRoot: true, httpAdminMiddleware: testMiddleware },{},{},{});
+            const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'testMiddleware')
+            should(middlewareFound).be.length(1);
+            done();
+        });
+    });
+
+    describe('initialises api with authentication enabled', function(done) {
+
+        it('enables an oauth/openID based authentication mechanism',function(done) {
+            const stub = sinon.stub(apiAuth, 'genericStrategy', function(){});
+            const adminAuth = { type: 'strategy', strategy: {} }
+            api.init({ httpAdminRoot: true, adminAuth },{},{},{});
+            should(stub.called).be.ok();
+            stub.restore();
+            done();
+        });
+
+        it('enables password protection',function(done) {
+            const adminAuth = { type: 'credentials' }
+            api.init({ httpAdminRoot: true, adminAuth },{},{},{});
+            
+            // is the name ("initialize") of the passport middleware present
+            const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'initialize')
+            should(middlewareFound).be.length(1);
+            done();
+        });
+
+    });
+
+    describe('initialises api with custom cors config', function (done) {
+        const httpAdminCors = {
+            origin: "*",
+            methods: "GET,PUT,POST,DELETE"
+        };
+
+        it('uses default cors middleware when user settings absent', function(done){
+            api.init({ httpAdminRoot: true }, {}, {}, {});
+            const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'corsMiddleware')
+            should(middlewareFound).be.length(1);
+            done();
+        })
+
+        it('enables custom cors middleware when settings present', function(done){
+            api.init({ httpAdminRoot: true, httpAdminCors }, {}, {}, {});
+            const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'corsMiddleware')
+            should(middlewareFound).be.length(2);
+            done();
+        })
+    });
+
+    describe('editor start', function (done) {
+
+        it('cannot be started when editor is disabled', function (done) {
+            const stub = sinon.stub(apiEditor, 'start', function () {
+                return Promise.resolve(true);
+            });
+            api.init({ httpAdminRoot: true, disableEditor: true }, {}, {}, {});
+            should(api.start()).resolvedWith(true);
+            stub.restore();
+            done();
+        });
+
+        it('can be started when editor enabled', function (done) {
+            const stub = sinon.stub(apiEditor, 'start');
+            api.init({ httpAdminRoot: true, disableEditor: false }, {}, {}, {});
+            api.start();
+            should(stub.called).be.true();
+            stub.restore();
+            done();
+        });
+
+    });
+
 });
diff --git a/test/unit/@node-red/registry/lib/index_spec.js b/test/unit/@node-red/registry/lib/index_spec.js
index 753486e9f..75a057730 100644
--- a/test/unit/@node-red/registry/lib/index_spec.js
+++ b/test/unit/@node-red/registry/lib/index_spec.js
@@ -17,7 +17,6 @@
 var should = require("should");
 var sinon = require("sinon");
 var path = require("path");
-var when = require("when");
 var fs = require("fs");
 
 var NR_TEST_UTILS = require("nr-test-utils");
@@ -51,7 +50,7 @@ describe('red/registry/index', function() {
     describe('#addModule', function() {
         it('loads the module and returns its info', function(done) {
             stubs.push(sinon.stub(loader,"addModule",function(module) {
-                return when.resolve();
+                return Promise.resolve();
             }));
             stubs.push(sinon.stub(typeRegistry,"getModuleInfo", function(module) {
                 return "info";
@@ -63,7 +62,7 @@ describe('red/registry/index', function() {
         });
         it('rejects if loader rejects', function(done) {
             stubs.push(sinon.stub(loader,"addModule",function(module) {
-                return when.reject("error");
+                return Promise.reject("error");
             }));
             stubs.push(sinon.stub(typeRegistry,"getModuleInfo", function(module) {
                 return "info";
@@ -80,7 +79,7 @@ describe('red/registry/index', function() {
     describe('#enableNode',function() {
         it('enables a node set',function(done) {
             stubs.push(sinon.stub(typeRegistry,"enableNodeSet",function() {
-                return when.resolve();
+                return Promise.resolve();
             }));
             stubs.push(sinon.stub(typeRegistry,"getNodeInfo", function() {
                 return {id:"node-set",loaded:true};
@@ -104,14 +103,14 @@ describe('red/registry/index', function() {
 
         it('triggers a node load',function(done) {
             stubs.push(sinon.stub(typeRegistry,"enableNodeSet",function() {
-                return when.resolve();
+                return Promise.resolve();
             }));
             var calls = 0;
             stubs.push(sinon.stub(typeRegistry,"getNodeInfo", function() {
                 // loaded=false on first call, true on subsequent
                 return {id:"node-set",loaded:(calls++>0)};
             }));
-            stubs.push(sinon.stub(loader,"loadNodeSet",function(){return when.resolve();}));
+            stubs.push(sinon.stub(loader,"loadNodeSet",function(){return Promise.resolve();}));
             stubs.push(sinon.stub(typeRegistry,"getFullNodeInfo"));
 
             registry.enableNode("node-set").then(function(ns) {
diff --git a/test/unit/@node-red/registry/lib/installer_spec.js b/test/unit/@node-red/registry/lib/installer_spec.js
index ad658fd16..c394956f6 100644
--- a/test/unit/@node-red/registry/lib/installer_spec.js
+++ b/test/unit/@node-red/registry/lib/installer_spec.js
@@ -16,7 +16,6 @@
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 var path = require("path");
 var fs = require('fs-extra');
 var EventEmitter = require('events');
@@ -26,6 +25,7 @@ var NR_TEST_UTILS = require("nr-test-utils");
 var installer = NR_TEST_UTILS.require("@node-red/registry/lib/installer");
 var registry = NR_TEST_UTILS.require("@node-red/registry/lib/index");
 var typeRegistry = NR_TEST_UTILS.require("@node-red/registry/lib/registry");
+const { events, exec, log } =  NR_TEST_UTILS.require("@node-red/util");
 
 describe('nodes/registry/installer', function() {
 
@@ -39,21 +39,15 @@ describe('nodes/registry/installer', function() {
         _: function(msg) { return msg }
     }
 
+    var execResponse;
+
     beforeEach(function() {
-        installer.init({log:mockLog, settings:{}, events: new EventEmitter(), exec: {
-            run: function() {
-                return Promise.resolve("");
-            }
-        }});
+        sinon.stub(exec,"run", () => execResponse || Promise.resolve(""))
+        installer.init({})
     });
-    function initInstaller(execResult) {
-        installer.init({log:mockLog, settings:{}, events: new EventEmitter(), exec: {
-            run: function() {
-                return execResult;
-            }
-        }});
-    }
+
     afterEach(function() {
+        execResponse = null;
         if (registry.addModule.restore) {
             registry.addModule.restore();
         }
@@ -73,7 +67,7 @@ describe('nodes/registry/installer', function() {
         if (fs.statSync.restore) {
             fs.statSync.restore();
         }
-
+        exec.run.restore();
     });
 
     describe("installs module", function() {
@@ -109,7 +103,7 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.reject(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
             installer.installModule("this_wont_exist").catch(function(err) {
                 err.should.have.property("code",404);
                 done();
@@ -123,7 +117,7 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.reject(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
             sinon.stub(typeRegistry,"getModuleInfo", function() {
                 return {
                     version: "0.1.1"
@@ -137,6 +131,7 @@ describe('nodes/registry/installer', function() {
         it("rejects when update requested to existing version", function(done) {
             sinon.stub(typeRegistry,"getModuleInfo", function() {
                 return {
+                    user: true,
                     version: "0.1.1"
                 }
             });
@@ -148,6 +143,7 @@ describe('nodes/registry/installer', function() {
         it("rejects when update requested to existing version and url", function(done) {
             sinon.stub(typeRegistry,"getModuleInfo", function() {
                 return {
+                    user: true,
                     version: "0.1.1"
                 }
             });
@@ -164,7 +160,7 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.reject(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
             installer.installModule("this_wont_exist").then(function() {
                 done(new Error("Unexpected success"));
             }).catch(err => {
@@ -182,10 +178,10 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.resolve(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
 
             var addModule = sinon.stub(registry,"addModule",function(md) {
-                return when.resolve(nodeInfo);
+                return Promise.resolve(nodeInfo);
             });
 
             installer.installModule("this_wont_exist").then(function(info) {
@@ -216,7 +212,7 @@ describe('nodes/registry/installer', function() {
         it("succeeds when path is valid node-red module", function(done) {
             var nodeInfo = {nodes:{module:"foo",types:["a"]}};
             var addModule = sinon.stub(registry,"addModule",function(md) {
-                return when.resolve(nodeInfo);
+                return Promise.resolve(nodeInfo);
             });
             var resourcesDir = path.resolve(path.join(__dirname,"resources","local","TestNodeModule","node_modules","TestNodeModule"));
 
@@ -227,7 +223,7 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.resolve(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
             installer.installModule(resourcesDir).then(function(info) {
                 info.should.eql(nodeInfo);
                 done();
@@ -243,10 +239,10 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.resolve(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
 
             var addModule = sinon.stub(registry,"addModule",function(md) {
-                return when.resolve(nodeInfo);
+                return Promise.resolve(nodeInfo);
             });
 
             installer.installModule("this_wont_exist",null,"https://example/foo-0.1.1.tgz").then(function(info) {
@@ -259,19 +255,20 @@ describe('nodes/registry/installer', function() {
     describe("uninstalls module", function() {
         it("rejects invalid module names", function(done) {
             var promises = [];
-            promises.push(installer.uninstallModule("this_wont_exist "));
-            promises.push(installer.uninstallModule("this_wont_exist;no_it_really_wont"));
-            when.settle(promises).then(function(results) {
-                results[0].state.should.be.eql("rejected");
-                results[1].state.should.be.eql("rejected");
+            var rejectedCount = 0;
+
+            promises.push(installer.uninstallModule("this_wont_exist ").catch(() => {rejectedCount++}));
+            promises.push(installer.uninstallModule("this_wont_exist;no_it_really_wont").catch(() => {rejectedCount++}));
+            Promise.all(promises).then(function() {
+                rejectedCount.should.eql(2);
                 done();
-            });
+            }).catch(done);
         });
 
         it("rejects with generic error", function(done) {
             var nodeInfo = [{module:"foo",types:["a"]}];
             var removeModule = sinon.stub(registry,"removeModule",function(md) {
-                return when.resolve(nodeInfo);
+                return Promise.resolve(nodeInfo);
             });
             var res = {
                 code: 1,
@@ -280,7 +277,7 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.reject(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
 
             installer.uninstallModule("this_wont_exist").then(function() {
                 done(new Error("Unexpected success"));
@@ -304,7 +301,7 @@ describe('nodes/registry/installer', function() {
             }
             var p = Promise.resolve(res);
             p.catch((err)=>{});
-            initInstaller(p)
+            execResponse = p;
 
             sinon.stub(fs,"statSync", function(fn) { return {}; });
 
diff --git a/test/unit/@node-red/registry/lib/loader_spec.js b/test/unit/@node-red/registry/lib/loader_spec.js
index 6dc9daa55..55f435069 100644
--- a/test/unit/@node-red/registry/lib/loader_spec.js
+++ b/test/unit/@node-red/registry/lib/loader_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var should = require("should");
-var when = require("when");
 var sinon = require("sinon");
 var path = require("path");
 var fs = require("fs-extra");
@@ -415,60 +414,61 @@ describe("red/nodes/registry/loader",function() {
             });
         });
 
-        it("load core node files scanned by lfs - missing html file", function(done) {
-            stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){
-                var result = {};
-                result["node-red"] = {
-                    "name": "node-red",
-                    "version": "1.2.3",
-                    "nodes": {
-                        "DuffNode": {
-                            "file": path.join(resourcesDir,"DuffNode","DuffNode.js"),
-                            "module": "node-red",
-                            "name": "DuffNode"
-                        }
-                    }
-                };
-                return result;
-            }));
-
-            stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
-            stubs.push(sinon.stub(registry,"addModule", function(){ return }));
-            // This module isn't already loaded
-            stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
-
-            stubs.push(sinon.stub(nodes,"registerType"));
-            loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
-            loader.load().then(function(result) {
-
-                registry.addModule.called.should.be.true();
-                var module = registry.addModule.lastCall.args[0];
-                module.should.have.property("name","node-red");
-                module.should.have.property("version","1.2.3");
-                module.should.have.property("nodes");
-                module.nodes.should.have.property("DuffNode");
-                module.nodes.DuffNode.should.have.property("id","node-red/DuffNode");
-                module.nodes.DuffNode.should.have.property("module","node-red");
-                module.nodes.DuffNode.should.have.property("name","DuffNode");
-                module.nodes.DuffNode.should.have.property("file");
-                module.nodes.DuffNode.should.have.property("template");
-                module.nodes.DuffNode.should.have.property("enabled",true);
-                module.nodes.DuffNode.should.have.property("loaded",false);
-                module.nodes.DuffNode.should.have.property("types");
-                module.nodes.DuffNode.types.should.have.a.length(0);
-                module.nodes.DuffNode.should.have.property("config","");
-                module.nodes.DuffNode.should.have.property("help",{});
-                module.nodes.DuffNode.should.have.property("namespace","node-red");
-                module.nodes.DuffNode.should.have.property('err');
-                module.nodes.DuffNode.err.should.endWith("DuffNode.html does not exist");
-
-                nodes.registerType.called.should.be.false();
-
-                done();
-            }).catch(function(err) {
-                done(err);
-            });
-        });
+        // it("load core node files scanned by lfs - missing html file", function(done) {
+        //     // This is now an okay situation
+        //     stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){
+        //         var result = {};
+        //         result["node-red"] = {
+        //             "name": "node-red",
+        //             "version": "1.2.3",
+        //             "nodes": {
+        //                 "DuffNode": {
+        //                     "file": path.join(resourcesDir,"DuffNode","DuffNode.js"),
+        //                     "module": "node-red",
+        //                     "name": "DuffNode"
+        //                 }
+        //             }
+        //         };
+        //         return result;
+        //     }));
+        //
+        //     stubs.push(sinon.stub(registry,"saveNodeList", function(){ return }));
+        //     stubs.push(sinon.stub(registry,"addModule", function(){ return }));
+        //     // This module isn't already loaded
+        //     stubs.push(sinon.stub(registry,"getNodeInfo", function(){ return null; }));
+        //
+        //     stubs.push(sinon.stub(nodes,"registerType"));
+        //     loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
+        //     loader.load().then(function(result) {
+        //
+        //         registry.addModule.called.should.be.true();
+        //         var module = registry.addModule.lastCall.args[0];
+        //         module.should.have.property("name","node-red");
+        //         module.should.have.property("version","1.2.3");
+        //         module.should.have.property("nodes");
+        //         module.nodes.should.have.property("DuffNode");
+        //         module.nodes.DuffNode.should.have.property("id","node-red/DuffNode");
+        //         module.nodes.DuffNode.should.have.property("module","node-red");
+        //         module.nodes.DuffNode.should.have.property("name","DuffNode");
+        //         module.nodes.DuffNode.should.have.property("file");
+        //         module.nodes.DuffNode.should.have.property("template");
+        //         module.nodes.DuffNode.should.have.property("enabled",true);
+        //         module.nodes.DuffNode.should.have.property("loaded",false);
+        //         module.nodes.DuffNode.should.have.property("types");
+        //         module.nodes.DuffNode.types.should.have.a.length(0);
+        //         module.nodes.DuffNode.should.have.property("config","");
+        //         module.nodes.DuffNode.should.have.property("help",{});
+        //         module.nodes.DuffNode.should.have.property("namespace","node-red");
+        //         module.nodes.DuffNode.should.have.property('err');
+        //         module.nodes.DuffNode.err.should.endWith("DuffNode.html does not exist");
+        //
+        //         nodes.registerType.called.should.be.false();
+        //
+        //         done();
+        //     }).catch(function(err) {
+        //         done(err);
+        //     });
+        // });
     });
 
     describe("#addModule",function() {
@@ -528,7 +528,7 @@ describe("red/nodes/registry/loader",function() {
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}});
             loader.addModule("TestNodeModule").then(function(result) {
-                result.should.eql("a node list");
+                result.should.eql("TestNodeModule");
 
                 registry.addModule.called.should.be.true();
                 var module = registry.addModule.lastCall.args[0];
@@ -585,7 +585,7 @@ describe("red/nodes/registry/loader",function() {
             stubs.push(sinon.stub(nodes,"registerType"));
             loader.init({log:{"_":function(){},warn:function(){}},nodes:nodes,version: function() { return "0.12.0"}, settings:{available:function(){return true;}}});
             loader.addModule("TestNodeModule").then(function(result) {
-                result.should.eql("a node list");
+                result.should.eql("TestNodeModule");
                 registry.addModule.called.should.be.false();
                 nodes.registerType.called.should.be.false();
                 done();
diff --git a/test/unit/@node-red/registry/lib/localfilesystem_spec.js b/test/unit/@node-red/registry/lib/localfilesystem_spec.js
index 82e4d1b2d..5cb3c180d 100644
--- a/test/unit/@node-red/registry/lib/localfilesystem_spec.js
+++ b/test/unit/@node-red/registry/lib/localfilesystem_spec.js
@@ -15,7 +15,6 @@
  **/
 
 var should = require("should");
-var when = require("when");
 var sinon = require("sinon");
 var path = require("path");
 
@@ -54,7 +53,7 @@ describe("red/nodes/registry/localfilesystem",function() {
     }
     describe("#getNodeFiles",function() {
         it("Finds all the node files in the resources tree",function(done) {
-            localfilesystem.init({settings:{coreNodesDir:resourcesDir}});
+            localfilesystem.init({coreNodesDir:resourcesDir});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -69,7 +68,7 @@ describe("red/nodes/registry/localfilesystem",function() {
             done();
         });
         it("Includes node files from settings",function(done) {
-            localfilesystem.init({settings:{nodesIncludes:['TestNode1.js'],coreNodesDir:resourcesDir}});
+            localfilesystem.init({nodesIncludes:['TestNode1.js'],coreNodesDir:resourcesDir});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -79,7 +78,7 @@ describe("red/nodes/registry/localfilesystem",function() {
             done();
         });
         it("Excludes node files from settings",function(done) {
-            localfilesystem.init({settings:{nodesExcludes:['TestNode1.js'],coreNodesDir:resourcesDir}});
+            localfilesystem.init({nodesExcludes:['TestNode1.js'],coreNodesDir:resourcesDir});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -89,7 +88,7 @@ describe("red/nodes/registry/localfilesystem",function() {
             done();
         });
         it("Finds nodes in userDir/nodes",function(done) {
-            localfilesystem.init({settings:{userDir:userDir}});
+            localfilesystem.init({userDir:userDir});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -100,7 +99,7 @@ describe("red/nodes/registry/localfilesystem",function() {
         });
 
         it("Finds nodes in settings.nodesDir (string)",function(done) {
-            localfilesystem.init({settings:{nodesDir:userDir}});
+            localfilesystem.init({nodesDir:userDir});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -111,7 +110,7 @@ describe("red/nodes/registry/localfilesystem",function() {
         });
         it("Finds nodes in settings.nodesDir (string,relative path)",function(done) {
             var relativeUserDir = path.join("test","unit","@node-red","registry","lib","resources","userDir");
-            localfilesystem.init({settings:{nodesDir:relativeUserDir}});
+            localfilesystem.init({nodesDir:relativeUserDir});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -121,7 +120,7 @@ describe("red/nodes/registry/localfilesystem",function() {
             done();
         });
         it("Finds nodes in settings.nodesDir (array)",function(done) {
-            localfilesystem.init({settings:{nodesDir:[userDir]}});
+            localfilesystem.init({nodesDir:[userDir]});
             var nodeList = localfilesystem.getNodeFiles(true);
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -140,7 +139,7 @@ describe("red/nodes/registry/localfilesystem",function() {
                 }
                 return _join.apply(null,arguments);
             }));
-            localfilesystem.init({settings:{coreNodesDir:moduleDir}});
+            localfilesystem.init({coreNodesDir:moduleDir});
             var nodeList = localfilesystem.getNodeFiles();
             nodeList.should.have.a.property("node-red");
             var nm = nodeList['node-red'];
@@ -176,18 +175,7 @@ describe("red/nodes/registry/localfilesystem",function() {
         it("scans icon files in the resources tree",function(done) {
             var count = 0;
             localfilesystem.init({
-
-                // events:{emit:function(eventName,dir){
-                //     if (count === 0) {
-                //         eventName.should.equal("node-icon-dir");
-                //         dir.name.should.equal("node-red");
-                //         dir.icons.should.be.an.Array();
-                //         count = 1;
-                //     } else if (count === 1) {
-                //         done();
-                //     }
-                // }},
-                settings:{coreNodesDir:resourcesDir}
+                coreNodesDir: resourcesDir
             });
             var list = localfilesystem.getNodeFiles(true);
             list.should.have.property("node-red");
@@ -202,22 +190,7 @@ describe("red/nodes/registry/localfilesystem",function() {
         it("scans icons dir in library",function(done) {
             var count = 0;
             localfilesystem.init({
-                //
-                // events:{emit:function(eventName,dir){
-                //     eventName.should.equal("node-icon-dir");
-                //     if (count === 0) {
-                //         dir.name.should.equal("node-red");
-                //         dir.icons.should.be.an.Array();
-                //         count = 1;
-                //     } else if (count === 1) {
-                //         dir.name.should.equal("Library");
-                //         dir.icons.should.be.an.Array();
-                //         dir.icons.length.should.equal(1);
-                //         dir.icons[0].should.be.equal("test_icon.png");
-                //         done();
-                //     }
-                // }},
-                settings:{userDir:userDir}
+                userDir: userDir
             });
             var list = localfilesystem.getNodeFiles(true);
             list.should.have.property("node-red");
@@ -241,7 +214,7 @@ describe("red/nodes/registry/localfilesystem",function() {
                 }
                 return _join.apply(null,arguments);
             }));
-            localfilesystem.init({settings:{coreNodesDir:moduleDir}});
+            localfilesystem.init({coreNodesDir:moduleDir});
             var nodeModule = localfilesystem.getModuleFiles('TestNodeModule');
             nodeModule.should.have.a.property('TestNodeModule');
             nodeModule['TestNodeModule'].should.have.a.property('name','TestNodeModule');
@@ -267,7 +240,7 @@ describe("red/nodes/registry/localfilesystem",function() {
                 }
                 return _join.apply(null,arguments);
             }));
-            localfilesystem.init({settings:{coreNodesDir:moduleDir}});
+            localfilesystem.init({coreNodesDir:moduleDir});
             /*jshint immed: false */
             (function(){
                 localfilesystem.getModuleFiles('WontExistModule');
@@ -287,14 +260,7 @@ describe("red/nodes/registry/localfilesystem",function() {
                 return _join.apply(null,arguments);
             }));
             localfilesystem.init({
-
-                // events:{emit:function(eventName,dir){
-                //     eventName.should.equal("node-icon-dir");
-                //     dir.name.should.equal("TestNodeModule");
-                //     dir.icons.should.be.an.Array();
-                //     done();
-                // }},
-                settings:{coreNodesDir:moduleDir}
+                coreNodesDir: moduleDir
             });
             var nodeModule = localfilesystem.getModuleFiles('TestNodeModule');
             nodeModule.should.have.property("TestNodeModule");
diff --git a/test/unit/@node-red/registry/lib/plugins_spec.js b/test/unit/@node-red/registry/lib/plugins_spec.js
new file mode 100644
index 000000000..8f32d3802
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/plugins_spec.js
@@ -0,0 +1,155 @@
+
+const should = require("should");
+const sinon = require("sinon");
+const path = require("path");
+
+const NR_TEST_UTILS = require("nr-test-utils");
+
+const plugins = NR_TEST_UTILS.require("@node-red/registry/lib/plugins");
+const registry = NR_TEST_UTILS.require("@node-red/registry/lib/registry");
+const { events } = NR_TEST_UTILS.require("@node-red/util");
+
+describe("red/nodes/registry/plugins",function() {
+    let receivedEvents = [];
+    let modules;
+    function handleEvent(evnt) {
+        receivedEvents.push(evnt);
+    }
+    beforeEach(function() {
+        plugins.init({});
+        receivedEvents = [];
+        modules = {
+            "test-module": {
+                plugins: {
+                    "test-set": {
+                        id: "test-module/test-set",
+                        enabled: true,
+                        config: "test-module-config",
+                        plugins: []
+                    },
+                    "test-disabled-set": {
+                        id: "test-module/test-disabled-set",
+                        enabled: false,
+                        config: "disabled-plugin-config",
+                        plugins: []
+                    }
+                }
+            }
+        }
+        events.on("registry:plugin-added",handleEvent);
+        sinon.stub(registry,"getModule", moduleId => modules[moduleId]);
+        sinon.stub(registry,"getModuleList", () => modules)
+    });
+    afterEach(function() {
+        events.removeListener("registry:plugin-added",handleEvent);
+        registry.getModule.restore();
+        registry.getModuleList.restore();
+    })
+
+    describe("registerPlugin", function() {
+        it("registers a plugin", function() {
+            let pluginDef = {}
+            plugins.registerPlugin("test-module/test-set","a-plugin",pluginDef);
+            receivedEvents.length.should.eql(1);
+            receivedEvents[0].should.eql("a-plugin");
+            should.exist(modules['test-module'].plugins['test-set'].plugins[0])
+            modules['test-module'].plugins['test-set'].plugins[0].should.equal(pluginDef)
+        })
+        it("calls a plugins onadd function", function() {
+            let pluginDef = { onadd: sinon.stub() }
+            plugins.registerPlugin("test-module/test-set","a-plugin",pluginDef);
+            pluginDef.onadd.called.should.be.true();
+        })
+    })
+
+    describe("getPlugin", function() {
+        it("returns a registered plugin", function() {
+            let pluginDef = {}
+            plugins.registerPlugin("test-module/test-set","a-plugin",pluginDef);
+            pluginDef.should.equal(plugins.getPlugin("a-plugin"));
+        })
+    })
+    describe("getPluginsByType", function() {
+        it("returns a plugins of a given type", function() {
+            let pluginDef = {type: "foo"}
+            let pluginDef2 = {type: "bar"}
+            let pluginDef3 = {type: "foo"}
+            plugins.registerPlugin("test-module/test-set","a-plugin",pluginDef);
+            plugins.registerPlugin("test-module/test-set","a-plugin2",pluginDef2);
+            plugins.registerPlugin("test-module/test-set","a-plugin3",pluginDef3);
+
+            let fooPlugins = plugins.getPluginsByType("foo");
+            let barPlugins = plugins.getPluginsByType("bar");
+            let noPlugins = plugins.getPluginsByType("none");
+
+            noPlugins.should.be.of.length(0);
+
+            fooPlugins.should.be.of.length(2);
+            fooPlugins.should.containEql(pluginDef);
+            fooPlugins.should.containEql(pluginDef3);
+
+            barPlugins.should.be.of.length(1);
+            barPlugins.should.containEql(pluginDef2);
+
+        })
+    })
+
+    describe("getPluginConfigs", function() {
+        it("gets all plugin configs", function() {
+            let configs = plugins.getPluginConfigs("en-US");
+            configs.should.eql(`
+<!-- --- [red-plugin:test-module/test-set] --- -->
+test-module-config`)
+        })
+    })
+
+
+    describe("getPluginList", function() {
+        it("returns a plugins of a given type", function() {
+            let pluginDef = {type: "foo"}
+            let pluginDef2 = {type: "bar"}
+            let pluginDef3 = {type: "foo"}
+            plugins.registerPlugin("test-module/test-set","a-plugin",pluginDef);
+            plugins.registerPlugin("test-module/test-set","a-plugin2",pluginDef2);
+            plugins.registerPlugin("test-module/test-set","a-plugin3",pluginDef3);
+
+            let pluginList = plugins.getPluginList();
+            JSON.stringify(pluginList).should.eql(JSON.stringify(
+                [
+                    {
+                        "id": "test-module/test-set",
+                        "enabled": true,
+                        "local": false,
+                        "user": false,
+                        "plugins": [
+                            {
+                                "type": "foo",
+                                "id": "a-plugin",
+                                "module": "test-module"
+                            },
+                            {
+                                "type": "bar",
+                                "id": "a-plugin2",
+                                "module": "test-module"
+                            },
+                            {
+                                "type": "foo",
+                                "id": "a-plugin3",
+                                "module": "test-module"
+                            }
+                        ]
+                    },
+                    {
+                        "id": "test-module/test-disabled-set",
+                        "enabled": false,
+                        "local": false,
+                        "user": false,
+                        "plugins": []
+                    }
+                ]
+            ))
+        })
+    })
+
+
+});
\ No newline at end of file
diff --git a/test/unit/@node-red/registry/lib/registry_spec.js b/test/unit/@node-red/registry/lib/registry_spec.js
index c7ad930c4..60b48938d 100644
--- a/test/unit/@node-red/registry/lib/registry_spec.js
+++ b/test/unit/@node-red/registry/lib/registry_spec.js
@@ -15,16 +15,13 @@
  **/
 
 var should = require("should");
-var when = require("when");
 var sinon = require("sinon");
 var path = require("path");
 
 var NR_TEST_UTILS = require("nr-test-utils");
 
 var typeRegistry = NR_TEST_UTILS.require("@node-red/registry/lib/registry");
-var EventEmitter = require('events');
-
-var events = new EventEmitter();
+const { events } = NR_TEST_UTILS.require("@node-red/util");
 
 describe("red/nodes/registry/registry",function() {
 
@@ -34,7 +31,7 @@ describe("red/nodes/registry/registry",function() {
 
     function stubSettings(s,available,initialConfig) {
         s.available =  function() {return available;};
-        s.set = sinon.spy(function(s,v) { return when.resolve();});
+        s.set = sinon.spy(function(s,v) { return Promise.resolve();});
         s.get = function(s) { return initialConfig;};
         return s;
     }
@@ -85,7 +82,7 @@ describe("red/nodes/registry/registry",function() {
 
     describe('#init/load', function() {
         it('loads initial config', function(done) {
-            typeRegistry.init(settingsWithStorageAndInitialConfig,null,events);
+            typeRegistry.init(settingsWithStorageAndInitialConfig,null);
             typeRegistry.getNodeList().should.have.lengthOf(0);
             typeRegistry.load();
             typeRegistry.getNodeList().should.have.lengthOf(1);
@@ -95,7 +92,7 @@ describe("red/nodes/registry/registry",function() {
         it('migrates legacy format', function(done) {
             var legacySettings = {
                 available: function() { return true; },
-                set: sinon.stub().returns(when.resolve()),
+                set: sinon.stub().returns(Promise.resolve()),
                 get: function() { return {
                     "123": {
                         "name": "72-sentiment.js",
@@ -122,7 +119,7 @@ describe("red/nodes/registry/registry",function() {
                  }}
             };
             var expected = JSON.parse('{"node-red":{"name":"node-red","nodes":{"sentiment":{"name":"sentiment","types":["sentiment"],"enabled":true,"module":"node-red"},"inject":{"name":"inject","types":["inject"],"enabled":true,"module":"node-red"}}},"testModule":{"name":"testModule","nodes":{"a-module.js":{"name":"a-module.js","types":["example"],"enabled":true,"module":"testModule"}}}}');
-            typeRegistry.init(legacySettings,null,events);
+            typeRegistry.init(legacySettings,null);
             typeRegistry.load();
             legacySettings.set.calledOnce.should.be.true();
             legacySettings.set.args[0][1].should.eql(expected);
@@ -134,7 +131,7 @@ describe("red/nodes/registry/registry",function() {
     describe.skip('#addNodeSet', function() {
        it('adds a node set for an unknown module', function() {
 
-           typeRegistry.init(settings,null,events);
+           typeRegistry.init(settings,null);
 
            typeRegistry.getNodeList().should.have.lengthOf(0);
            typeRegistry.getModuleList().should.eql({});
@@ -163,7 +160,7 @@ describe("red/nodes/registry/registry",function() {
 
        it('adds a node set to an existing module', function() {
 
-           typeRegistry.init(settings,null,events);
+           typeRegistry.init(settings,null);
            typeRegistry.getNodeList().should.have.lengthOf(0);
            typeRegistry.getModuleList().should.eql({});
 
@@ -192,7 +189,7 @@ describe("red/nodes/registry/registry",function() {
        });
 
        it('doesnt add node set types if node set has an error', function() {
-           typeRegistry.init(settings,null,events);
+           typeRegistry.init(settings,null);
            typeRegistry.getNodeList().should.have.lengthOf(0);
            typeRegistry.getModuleList().should.eql({});
 
@@ -208,7 +205,7 @@ describe("red/nodes/registry/registry",function() {
        });
 
        it('doesnt add node set if type already exists', function() {
-           typeRegistry.init(settings,null,events);
+           typeRegistry.init(settings,null);
            typeRegistry.getNodeList().should.have.lengthOf(0);
            typeRegistry.getModuleList().should.eql({});
 
@@ -242,7 +239,7 @@ describe("red/nodes/registry/registry",function() {
 
     describe("#enableNodeSet", function() {
         it('throws error if settings unavailable', function() {
-            typeRegistry.init(settings,null,events);
+            typeRegistry.init(settings,null);
             /*jshint immed: false */
             (function(){
                 typeRegistry.enableNodeSet("test-module/test-name");
@@ -250,7 +247,7 @@ describe("red/nodes/registry/registry",function() {
         });
 
         it('throws error if module unknown', function() {
-            typeRegistry.init(settingsWithStorageAndInitialConfig,null,events);
+            typeRegistry.init(settingsWithStorageAndInitialConfig,null);
             /*jshint immed: false */
             (function(){
                 typeRegistry.enableNodeSet("test-module/unknown");
@@ -261,7 +258,7 @@ describe("red/nodes/registry/registry",function() {
     });
     describe("#disableNodeSet", function() {
         it('throws error if settings unavailable', function() {
-            typeRegistry.init(settings,null,events);
+            typeRegistry.init(settings,null);
             /*jshint immed: false */
             (function(){
                 typeRegistry.disableNodeSet("test-module/test-name");
@@ -269,7 +266,7 @@ describe("red/nodes/registry/registry",function() {
         });
 
         it('throws error if module unknown', function() {
-            typeRegistry.init(settingsWithStorageAndInitialConfig,null,events);
+            typeRegistry.init(settingsWithStorageAndInitialConfig,null);
             /*jshint immed: false */
             (function(){
                 typeRegistry.disableNodeSet("test-module/unknown");
@@ -280,7 +277,7 @@ describe("red/nodes/registry/registry",function() {
 
     describe('#getNodeConfig', function() {
         it('returns nothing for an unregistered type config', function(done) {
-            typeRegistry.init(settings,null,events);
+            typeRegistry.init(settings,null);
             var config = typeRegistry.getNodeConfig("imaginary-shark");
             (config === null).should.be.true();
             done();
@@ -289,7 +286,7 @@ describe("red/nodes/registry/registry",function() {
 
     describe('#saveNodeList',function() {
         it('rejects when settings unavailable',function(done) {
-            typeRegistry.init(stubSettings({},false,{}),null,events);
+            typeRegistry.init(stubSettings({},false,{}),null);
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {"test-name":{module:"test-module",name:"test-name",types:[]}}});
             typeRegistry.saveNodeList().catch(function(err) {
                 done();
@@ -297,7 +294,7 @@ describe("red/nodes/registry/registry",function() {
         });
         it('saves the list',function(done) {
             var s = stubSettings({},true,{});
-            typeRegistry.init(s,null,events);
+            typeRegistry.init(s,null);
 
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":testNodeSet1,
@@ -326,7 +323,7 @@ describe("red/nodes/registry/registry",function() {
     describe('#removeModule',function() {
         it('throws error for unknown module', function() {
             var s = stubSettings({},true,{});
-            typeRegistry.init(s,null,events);
+            typeRegistry.init(s,null);
             /*jshint immed: false */
             (function(){
                 typeRegistry.removeModule("test-module/unknown");
@@ -334,7 +331,7 @@ describe("red/nodes/registry/registry",function() {
         });
         it('throws error for unavaiable settings', function() {
             var s = stubSettings({},false,{});
-            typeRegistry.init(s,null,events);
+            typeRegistry.init(s,null);
             /*jshint immed: false */
             (function(){
                 typeRegistry.removeModule("test-module/unknown");
@@ -342,7 +339,7 @@ describe("red/nodes/registry/registry",function() {
         });
         it('removes a known module', function() {
             var s = stubSettings({},true,{});
-            typeRegistry.init(s,null,events);
+            typeRegistry.init(s,null);
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":testNodeSet1
             }});
@@ -361,7 +358,7 @@ describe("red/nodes/registry/registry",function() {
         it('returns node config', function() {
             typeRegistry.init(settings,{
                 getNodeHelp: function(config) { return "HE"+config.name+"LP" }
-            },events);
+            });
 
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
@@ -390,7 +387,7 @@ describe("red/nodes/registry/registry",function() {
     });
     describe('#getModuleInfo', function() {
         it('returns module info', function() {
-            typeRegistry.init(settings,{},events);
+            typeRegistry.init(settings,{});
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
                     id: "test-module/test-name",
@@ -414,7 +411,7 @@ describe("red/nodes/registry/registry",function() {
     });
     describe('#getNodeInfo', function() {
         it('returns node info', function() {
-            typeRegistry.init(settings,{},events);
+            typeRegistry.init(settings,{});
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
                     id: "test-module/test-name",
@@ -435,7 +432,7 @@ describe("red/nodes/registry/registry",function() {
     });
     describe('#getFullNodeInfo', function() {
         it('returns node info', function() {
-            typeRegistry.init(settings,{},events);
+            typeRegistry.init(settings,{});
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
                     id: "test-module/test-name",
@@ -460,7 +457,7 @@ describe("red/nodes/registry/registry",function() {
     });
     describe('#getNodeList', function() {
         it("returns a filtered list", function() {
-            typeRegistry.init(settings,{},events);
+            typeRegistry.init(settings,{});
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
                     id: "test-module/test-name",
@@ -527,7 +524,7 @@ describe("red/nodes/registry/registry",function() {
 
         it('returns a registered icon' , function() {
             var testIcon = path.resolve(__dirname+'/resources/userDir/lib/icons/');
-            typeRegistry.init(settings,{},events);
+            typeRegistry.init(settings,{});
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
                     id: "test-module/test-name",
@@ -559,7 +556,7 @@ describe("red/nodes/registry/registry",function() {
 
         it('returns an icon list of registered node module', function() {
             var testIcon = path.resolve(__dirname+'/resources/userDir/lib/icons/');
-            typeRegistry.init(settings,{},events);
+            typeRegistry.init(settings,{});
             typeRegistry.addModule({name: "test-module",version:"0.0.1",nodes: {
                 "test-name":{
                     id: "test-module/test-name",
diff --git a/test/unit/@node-red/registry/lib/resources/local/TestNode2/TestNode2.js b/test/unit/@node-red/registry/lib/resources/local/TestNode2/TestNode2.js
index faf61a8f3..1bf2fa6c9 100644
--- a/test/unit/@node-red/registry/lib/resources/local/TestNode2/TestNode2.js
+++ b/test/unit/@node-red/registry/lib/resources/local/TestNode2/TestNode2.js
@@ -1,8 +1,7 @@
 // A test node that exports a function which returns a resolving promise
 
-var when = require("when");
 module.exports = function(RED) {
-    return when.promise(function(resolve,reject) {
+    return new Promise(function(resolve,reject) {
         function TestNode(n) {}
         RED.nodes.registerType("test-node-2",TestNode);
         resolve();
diff --git a/test/unit/@node-red/registry/lib/resources/local/TestNode3/TestNode3.js b/test/unit/@node-red/registry/lib/resources/local/TestNode3/TestNode3.js
index 756dc1398..b9ee6a624 100644
--- a/test/unit/@node-red/registry/lib/resources/local/TestNode3/TestNode3.js
+++ b/test/unit/@node-red/registry/lib/resources/local/TestNode3/TestNode3.js
@@ -1,8 +1,7 @@
 // A test node that exports a function which returns a rejecting promise
 
-var when = require("when");
 module.exports = function(RED) {
-    return when.promise(function(resolve,reject) {
+    return new Promise(function(resolve,reject) {
         reject("fail");
     });
 }
diff --git a/test/unit/@node-red/registry/lib/subflow_spec.js b/test/unit/@node-red/registry/lib/subflow_spec.js
new file mode 100644
index 000000000..2aa7db203
--- /dev/null
+++ b/test/unit/@node-red/registry/lib/subflow_spec.js
@@ -0,0 +1,3 @@
+describe("red/nodes/registry/subflow",function() {
+    it.skip("NEEDS TESTS");
+});
diff --git a/test/unit/@node-red/registry/lib/util_spec.js b/test/unit/@node-red/registry/lib/util_spec.js
index a82519d11..d2384e5dc 100644
--- a/test/unit/@node-red/registry/lib/util_spec.js
+++ b/test/unit/@node-red/registry/lib/util_spec.js
@@ -14,7 +14,54 @@
  * limitations under the License.
  **/
 
+const should = require("should");
+const NR_TEST_UTILS = require("nr-test-utils");
+const registryUtil = NR_TEST_UTILS.require("@node-red/registry/lib/util");
+
 
 describe("red/nodes/registry/util",function() {
-    it.skip("NEEDS TESTS");
+    describe("createNodeApi", function() {
+        it.skip("needs tests");
+    });
+    describe("checkModuleAllowed", function() {
+        function checkList(module, version, allowList, denyList) {
+            return registryUtil.checkModuleAllowed(
+                module,
+                version,
+                registryUtil.parseModuleList(allowList),
+                registryUtil.parseModuleList(denyList)
+            )
+        }
+
+        it("allows module with no allow/deny list provided", function() {
+            checkList("abc","1.2.3",[],[]).should.be.true();
+        })
+        it("defaults allow to * when only deny list is provided", function() {
+            checkList("abc","1.2.3",["*"],["def"]).should.be.true();
+            checkList("def","1.2.3",["*"],["def"]).should.be.false();
+        })
+        it("uses most specific matching rule", function() {
+            checkList("abc","1.2.3",["ab*"],["a*"]).should.be.true();
+            checkList("def","1.2.3",["d*"],["de*"]).should.be.false();
+        })
+        it("checks version string using semver rules", function() {
+            // Deny
+            checkList("abc","1.2.3",["abc@1.2.2"],["*"]).should.be.false();
+            checkList("abc","1.2.3",["abc@1.2.4"],["*"]).should.be.false();
+            checkList("abc","1.2.3",["abc@>1.2.3"],["*"]).should.be.false();
+            checkList("abc","1.2.3",["abc@>=1.2.3"],["abc"]).should.be.false();
+
+
+            checkList("node-red-contrib-foo","1.2.3",["*"],["*contrib*"]).should.be.false();
+
+
+            // Allow
+            checkList("abc","1.2.3",["abc@1.2.3"],["*"]).should.be.true();
+            checkList("abc","1.2.3",["abc@<1.2.4"],["*"]).should.be.true();
+            checkList("abc","1.2.3",["abc"],["abc@>1.2.3"]).should.be.true();
+            checkList("abc","1.2.3",["abc"],["abc@<1.2.3||>1.2.3"]).should.be.true();
+            checkList("node-red-contrib-foo","1.2.3",["*contrib*"],["*"]).should.be.true();
+        })
+
+    })
 });
diff --git a/test/unit/@node-red/runtime/lib/api/comms_spec.js b/test/unit/@node-red/runtime/lib/api/comms_spec.js
index e1359cb7d..2f2e35a54 100644
--- a/test/unit/@node-red/runtime/lib/api/comms_spec.js
+++ b/test/unit/@node-red/runtime/lib/api/comms_spec.js
@@ -19,6 +19,7 @@ var sinon = require("sinon");
 
 var NR_TEST_UTILS = require("nr-test-utils");
 var comms = NR_TEST_UTILS.require("@node-red/runtime/lib/api/comms");
+var events = NR_TEST_UTILS.require("@node-red/util/lib/events");
 
 describe("runtime-api/comms", function() {
     describe("listens for events", function() {
@@ -30,21 +31,19 @@ describe("runtime-api/comms", function() {
         }
         var eventHandlers = {};
         before(function(done) {
+            sinon.stub(events,"removeListener", function() {})
+            sinon.stub(events,"on", function(evt,handler) { eventHandlers[evt] = handler })
             comms.init({
                 log: {
                     trace: function(){}
-                },
-                events: {
-                    removeListener: function() {},
-                    on: function(evt,handler) {
-                        eventHandlers[evt] = handler;
-                    }
                 }
             })
             comms.addConnection({client: clientConnection}).then(done);
         })
         after(function(done) {
             comms.removeConnection({client: clientConnection}).then(done);
+            events.removeListener.restore();
+            events.on.restore();
         })
         afterEach(function() {
             messages = [];
@@ -98,18 +97,18 @@ describe("runtime-api/comms", function() {
             }
         }
         before(function() {
+            sinon.stub(events,"removeListener", function() {})
+            sinon.stub(events,"on", function(evt,handler) { eventHandlers[evt] = handler })
             comms.init({
                 log: {
                     trace: function(){}
-                },
-                events: {
-                    removeListener: function() {},
-                    on: function(evt,handler) {
-                        eventHandlers[evt] = handler;
-                    }
                 }
             })
         })
+        after(function() {
+            events.removeListener.restore();
+            events.on.restore();
+        })
         afterEach(function(done) {
             comms.removeConnection({client: clientConnection1}).then(function() {
                 comms.removeConnection({client: clientConnection2}).then(done);
@@ -178,18 +177,18 @@ describe("runtime-api/comms", function() {
         }
         var eventHandlers = {};
         before(function() {
+            sinon.stub(events,"removeListener", function() {})
+            sinon.stub(events,"on", function(evt,handler) { eventHandlers[evt] = handler })
             comms.init({
                 log: {
                     trace: function(){}
-                },
-                events: {
-                    removeListener: function() {},
-                    on: function(evt,handler) {
-                        eventHandlers[evt] = handler;
-                    }
                 }
             })
         })
+        after(function() {
+            events.removeListener.restore();
+            events.on.restore();
+        })
         afterEach(function(done) {
             messages = [];
             comms.removeConnection({client: clientConnection}).then(done);
diff --git a/test/unit/@node-red/runtime/lib/api/nodes_spec.js b/test/unit/@node-red/runtime/lib/api/nodes_spec.js
index 6481c653d..327df15e0 100644
--- a/test/unit/@node-red/runtime/lib/api/nodes_spec.js
+++ b/test/unit/@node-red/runtime/lib/api/nodes_spec.js
@@ -185,7 +185,6 @@ var request = require('supertest');
 var express = require('express');
 var bodyParser = require('body-parser');
 var sinon = require('sinon');
-var when = require('when');
 
 var nodes = require("../../../../red/api/admin/nodes");
 var apiUtil = require("../../../../red/api/util");
@@ -418,7 +417,7 @@ describe("api/admin/nodes", function() {
                     nodes:{
                         getModuleInfo: function(id) { return null; },
                         installModule: function() {
-                            return when.resolve({
+                            return Promise.resolve({
                                 name:"foo",
                                 nodes:[{id:"123"}]
                             });
@@ -446,7 +445,7 @@ describe("api/admin/nodes", function() {
                     nodes:{
                         getModuleInfo: function(id) { return {nodes:{id:"123"}}; },
                         installModule: function() {
-                            return when.resolve({id:"123"});
+                            return Promise.resolve({id:"123"});
                         }
                     }
                 });
@@ -468,7 +467,7 @@ describe("api/admin/nodes", function() {
                     nodes:{
                         getModuleInfo: function(id) { return null },
                         installModule: function() {
-                            return when.reject(new Error("test error"));
+                            return Promise.reject(new Error("test error"));
                         }
                     }
                 });
@@ -492,7 +491,7 @@ describe("api/admin/nodes", function() {
                         installModule: function() {
                             var err = new Error("test error");
                             err.code = 404;
-                            return when.reject(err);
+                            return Promise.reject(err);
                         }
                     }
                 });
@@ -533,7 +532,7 @@ describe("api/admin/nodes", function() {
                     nodes:{
                         getModuleInfo: function(id) { return {nodes:[{id:"123"}]} },
                         getNodeInfo: function() { return null },
-                        uninstallModule: function() { return when.resolve({id:"123"});}
+                        uninstallModule: function() { return Promise.resolve({id:"123"});}
                     }
                 });
                 request(app)
@@ -572,7 +571,7 @@ describe("api/admin/nodes", function() {
                     nodes:{
                         getModuleInfo: function(id) { return {nodes:[{id:"123"}]} },
                         getNodeInfo: function() { return null },
-                        uninstallModule: function() { return when.reject(new Error("test error"));}
+                        uninstallModule: function() { return Promise.reject(new Error("test error"));}
                     }
                 });
                 request(app)
@@ -686,7 +685,7 @@ describe("api/admin/nodes", function() {
                 settings:{available:function(){return true}},
                 nodes:{
                     getNodeInfo: function() { return {id:"123",enabled: false} },
-                    enableNode: function() { return when.resolve({id:"123",enabled: true,types:['a']}); }
+                    enableNode: function() { return Promise.resolve({id:"123",enabled: true,types:['a']}); }
                 }
             });
             request(app)
@@ -709,7 +708,7 @@ describe("api/admin/nodes", function() {
                 settings:{available:function(){return true}},
                 nodes:{
                     getNodeInfo: function() { return {id:"123",enabled: true} },
-                    disableNode: function() { return when.resolve({id:"123",enabled: false,types:['a']}); }
+                    disableNode: function() { return Promise.resolve({id:"123",enabled: false,types:['a']}); }
                 }
             });
             request(app)
@@ -729,8 +728,8 @@ describe("api/admin/nodes", function() {
 
         describe('no-ops if already in the right state', function() {
             function run(state,done) {
-                var enableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: true,types:['a']}) });
-                var disableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: false,types:['a']}) });
+                var enableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: true,types:['a']}) });
+                var disableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: false,types:['a']}) });
 
                 initNodes({
                     settings:{available:function(){return true}},
@@ -768,8 +767,8 @@ describe("api/admin/nodes", function() {
 
         describe('does not no-op if err on node', function() {
             function run(state,done) {
-                var enableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: true,types:['a']}) });
-                var disableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: false,types:['a']}) });
+                var enableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: true,types:['a']}) });
+                var disableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: false,types:['a']}) });
 
                 initNodes({
                     settings:{available:function(){return true}},
@@ -811,11 +810,11 @@ describe("api/admin/nodes", function() {
             var enableNode = sinon.stub();
             enableNode.onFirstCall().returns((function() {
                 n1.enabled = true;
-                return when.resolve(n1);
+                return Promise.resolve(n1);
             })());
             enableNode.onSecondCall().returns((function() {
                 n2.enabled = true;
-                return when.resolve(n2);
+                return Promise.resolve(n2);
             })());
             enableNode.returns(null);
             initNodes({
@@ -849,11 +848,11 @@ describe("api/admin/nodes", function() {
             var disableNode = sinon.stub();
             disableNode.onFirstCall().returns((function() {
                 n1.enabled = false;
-                return when.resolve(n1);
+                return Promise.resolve(n1);
             })());
             disableNode.onSecondCall().returns((function() {
                 n2.enabled = false;
-                return when.resolve(n2);
+                return Promise.resolve(n2);
             })());
             disableNode.returns(null);
             initNodes({
@@ -886,11 +885,11 @@ describe("api/admin/nodes", function() {
                 var node = {id:"123",enabled:state,types:['a']};
                 var enableNode = sinon.spy(function(id) {
                     node.enabled = true;
-                    return when.resolve(node);
+                    return Promise.resolve(node);
                 });
                 var disableNode = sinon.spy(function(id) {
                     node.enabled = false;
-                    return when.resolve(node);
+                    return Promise.resolve(node);
                 });
 
                 initNodes({
@@ -933,11 +932,11 @@ describe("api/admin/nodes", function() {
                 var node = {id:"123",enabled:state,types:['a'],err:"foo"};
                 var enableNode = sinon.spy(function(id) {
                     node.enabled = true;
-                    return when.resolve(node);
+                    return Promise.resolve(node);
                 });
                 var disableNode = sinon.spy(function(id) {
                     node.enabled = false;
-                    return when.resolve(node);
+                    return Promise.resolve(node);
                 });
 
                 initNodes({
diff --git a/test/unit/@node-red/runtime/lib/api/plugins_spec.js b/test/unit/@node-red/runtime/lib/api/plugins_spec.js
new file mode 100644
index 000000000..7ae6d8286
--- /dev/null
+++ b/test/unit/@node-red/runtime/lib/api/plugins_spec.js
@@ -0,0 +1,68 @@
+const should = require("should");
+const sinon = require("sinon");
+
+const NR_TEST_UTILS = require("nr-test-utils");
+const plugins = NR_TEST_UTILS.require("@node-red/runtime/lib/api/plugins")
+
+const mockLog = () => ({
+    log: sinon.stub(),
+    debug: sinon.stub(),
+    trace: sinon.stub(),
+    warn: sinon.stub(),
+    info: sinon.stub(),
+    metric: sinon.stub(),
+    audit: sinon.stub(),
+    _: function() { return "abc"}
+})
+
+describe("runtime-api/plugins", function() {
+    const pluginList = [{id:"one",module:'test-module'},{id:"two",module:"node-red"}];
+    const pluginConfigs = "123";
+
+    describe("getPluginList", function() {
+        it("gets the plugin list", function() {
+            plugins.init({
+                log: mockLog(),
+                plugins: {
+                    getPluginList: function() { return pluginList}
+                }
+            });
+            return plugins.getPluginList({}).then(function(result) {
+                result.should.eql(pluginList);
+            })
+        });
+    });
+    describe("getPluginConfigs", function() {
+        it("gets the plugin configs", function() {
+            plugins.init({
+                log: mockLog(),
+                plugins: {
+                    getPluginConfigs: function() { return pluginConfigs}
+                }
+            });
+            return plugins.getPluginConfigs({}).then(function(result) {
+                result.should.eql(pluginConfigs);
+            })
+        });
+    });
+    describe("getPluginCatalogs", function() {
+        it("gets the plugin catalogs", function() {
+            plugins.init({
+                log: mockLog(),
+                plugins: {
+                    getPluginList: function() { return pluginList}
+                },
+                i18n: {
+                    i: {
+                        changeLanguage: function(lang,done) { done && done() },
+                        getResourceBundle: function(lang, id) { return {lang,id}}
+                    }
+                }
+            });
+            return plugins.getPluginCatalogs({lang: "en-US"}).then(function(result) {
+                JSON.stringify(result).should.eql(JSON.stringify({ one: { lang: "en-US", id: "one" } }))
+            })
+        });
+    });
+
+});
\ No newline at end of file
diff --git a/test/unit/@node-red/runtime/lib/api/settings_spec.js b/test/unit/@node-red/runtime/lib/api/settings_spec.js
index 3830e9ab2..b5b4878e2 100644
--- a/test/unit/@node-red/runtime/lib/api/settings_spec.js
+++ b/test/unit/@node-red/runtime/lib/api/settings_spec.js
@@ -48,7 +48,7 @@ describe("runtime-api/settings", function() {
                 },
                 nodes: {
                     listContextStores: () => { return {stores:["file","memory"], default: "file"} },
-                    paletteEditorEnabled: () => false,
+                    installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
                 storage: {}
@@ -61,8 +61,8 @@ describe("runtime-api/settings", function() {
                 result.should.not.have.property("foo",123);
                 result.should.have.property("flowEncryptionType","test-key-type");
                 result.should.not.have.property("user");
-                result.should.have.property("editorTheme");
-                result.editorTheme.should.eql({palette:{editable:false}});
+                result.should.have.property("externalModules");
+                result.externalModules.should.eql({palette:{allowInstall:false, allowUpload: false}});
 
             })
         });
@@ -79,7 +79,7 @@ describe("runtime-api/settings", function() {
                 },
                 nodes: {
                     listContextStores: () => { return {stores:["file","memory"], default: "file"} },
-                    paletteEditorEnabled: () => false,
+                    installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
                 storage: {}
@@ -115,7 +115,7 @@ describe("runtime-api/settings", function() {
                 },
                 nodes: {
                     listContextStores: () => { return {stores:["file","memory"], default: "file"} },
-                    paletteEditorEnabled: () => false,
+                    installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
                 storage: {
@@ -166,7 +166,7 @@ describe("runtime-api/settings", function() {
                 },
                 nodes: {
                     listContextStores: () => { return {stores:["file","memory"], default: "file"} },
-                    paletteEditorEnabled: () => false,
+                    installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
                 storage: {
@@ -207,7 +207,7 @@ describe("runtime-api/settings", function() {
                 },
                 nodes: {
                     listContextStores: () => { return {stores:["file","memory"], default: "file"} },
-                    paletteEditorEnabled: () => false,
+                    installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
                 storage: {
@@ -252,7 +252,7 @@ describe("runtime-api/settings", function() {
                 },
                 nodes: {
                     listContextStores: () => { return {stores:["file","memory"], default: "file"} },
-                    paletteEditorEnabled: () => false,
+                    installerEnabled: () => false,
                     getCredentialKeyType: () => "test-key-type"
                 },
                 storage: {
@@ -588,7 +588,6 @@ var comms = require("../../../../red/api/editor/comms");
 var info = require("../../../../red/api/editor/settings");
 var auth = require("../../../../red/api/auth");
 var sshkeys = require("../../../../red/api/editor/sshkeys");
-var when = require("when");
 var bodyParser = require("body-parser");
 var fs = require("fs-extra");
 var fspath = require("path");
@@ -611,11 +610,11 @@ describe("api/editor/sshkeys", function() {
             exportNodeSettings:function(){},
             storage: {
                 getSessions: function(){
-                    return when.resolve(session_data);
+                    return Promise.resolve(session_data);
                 },
                 setSessions: function(_session) {
                     session_data = _session;
-                    return when.resolve();
+                    return Promise.resolve();
                 }
             }
         },
@@ -633,7 +632,7 @@ describe("api/editor/sshkeys", function() {
         },
         events:{on:function(){},removeListener:function(){}},
         isStarted: function() { return isStarted; },
-        nodes: {paletteEditorEnabled: function() { return false }}
+        nodes: {installerEnabled: function() { return false }}
     };
 
     before(function() {
diff --git a/test/unit/@node-red/runtime/lib/flows/index_spec.js b/test/unit/@node-red/runtime/lib/flows/index_spec.js
index df5012844..e230d2407 100644
--- a/test/unit/@node-red/runtime/lib/flows/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/flows/index_spec.js
@@ -16,14 +16,13 @@
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 var clone = require("clone");
 var NR_TEST_UTILS = require("nr-test-utils");
 
 var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/flows");
 var RedNode = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/Node");
 var RED = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes");
-var events = NR_TEST_UTILS.require("@node-red/runtime/lib/events");
+var events = NR_TEST_UTILS.require("@node-red/util/lib/events");
 var credentials = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/credentials");
 var typeRegistry = NR_TEST_UTILS.require("@node-red/registry")
 var Flow = NR_TEST_UTILS.require("@node-red/runtime/lib/flows/Flow");
@@ -65,13 +64,13 @@ describe('flows/index', function() {
             conf.forEach(function(n) {
                 delete n.credentials;
             });
-            return when.resolve();
+            return Promise.resolve();
         });
         credentialsLoad = sinon.stub(credentials,"load",function(creds) {
             if (creds && creds.hasOwnProperty("$") && creds['$'] === "fail") {
-                return when.reject("creds error");
+                return Promise.reject("creds error");
             }
-            return when.resolve();
+            return Promise.resolve();
         });
         flowCreate = sinon.stub(Flow,"create",function(parent, global, flow) {
             var id;
@@ -101,7 +100,7 @@ describe('flows/index', function() {
         storage = {
             saveFlows: function(conf) {
                 storage.conf = conf;
-                return when.resolve();
+                return Promise.resolve();
             }
         }
     });
@@ -145,10 +144,10 @@ describe('flows/index', function() {
             var loadStorage = {
                 saveFlows: function(conf) {
                     loadStorage.conf = conf;
-                    return when.resolve(456);
+                    return Promise.resolve(456);
                 },
                 getFlows: function() {
-                    return when.resolve({flows:originalConfig,rev:123})
+                    return Promise.resolve({flows:originalConfig,rev:123})
                 }
             }
             flows.init({log:mockLog, settings:{},storage:loadStorage});
@@ -207,7 +206,7 @@ describe('flows/index', function() {
             newConfig.push({id:"t2",type:"tab"});
             newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
             events.once('flows:started',function() {
                 flows.setFlows(newConfig,"nodes").then(function() {
@@ -235,7 +234,7 @@ describe('flows/index', function() {
             newConfig.push({id:"t2",type:"tab"});
             newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
 
             events.once('flows:started',function() {
@@ -277,7 +276,7 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
             flows.init({log:mockLog, settings:{},storage:storage});
             flows.load().then(function() {
@@ -297,7 +296,7 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
 
             events.once('flows:started',function() {
@@ -317,7 +316,7 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
 
             flows.init({log:mockLog, settings:{},storage:storage});
@@ -336,7 +335,7 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
             flows.init({log:mockLog, settings:{},storage:storage});
             flows.load().then(function() {
@@ -370,7 +369,7 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
             flows.init({log:mockLog, settings:{},storage:storage});
             flows.load().then(function() {
@@ -394,7 +393,7 @@ describe('flows/index', function() {
     //             {id:"t1",type:"tab"}
     //         ];
     //         storage.getFlows = function() {
-    //             return when.resolve({flows:originalConfig});
+    //             return Promise.resolve({flows:originalConfig});
     //         }
     //
     //         events.once('flows:started',function() {
@@ -419,7 +418,7 @@ describe('flows/index', function() {
     //             {id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
     //         ];
     //         storage.getFlows = function() {
-    //             return when.resolve({flows:originalConfig});
+    //             return Promise.resolve({flows:originalConfig});
     //         }
     //
     //         events.once('flows:started',function() {
@@ -447,7 +446,7 @@ describe('flows/index', function() {
     //             {id:"t1",type:"tab"}
     //         ];
     //         storage.getFlows = function() {
-    //             return when.resolve({flows:originalConfig});
+    //             return Promise.resolve({flows:originalConfig});
     //         }
     //
     //         events.once('flows:started',function() {
@@ -473,7 +472,7 @@ describe('flows/index', function() {
     //             {id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
     //         ];
     //         storage.getFlows = function() {
-    //             return when.resolve({flows:originalConfig});
+    //             return Promise.resolve({flows:originalConfig});
     //         }
     //
     //         events.once('flows:started',function() {
@@ -548,7 +547,7 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
             flows.init({log:mockLog, settings:{},storage:storage});
             flows.load().then(function() {
@@ -572,10 +571,10 @@ describe('flows/index', function() {
                 {id:"t1",type:"tab"}
             ];
             storage.getFlows = function() {
-                return when.resolve({flows:originalConfig});
+                return Promise.resolve({flows:originalConfig});
             }
             storage.setFlows = function() {
-                return when.resolve();
+                return Promise.resolve();
             }
             flows.init({log:mockLog, settings:{},storage:storage});
             flows.load().then(function() {
diff --git a/test/unit/@node-red/runtime/lib/flows/util_spec.js b/test/unit/@node-red/runtime/lib/flows/util_spec.js
index 8e1f15754..59169376e 100644
--- a/test/unit/@node-red/runtime/lib/flows/util_spec.js
+++ b/test/unit/@node-red/runtime/lib/flows/util_spec.js
@@ -16,7 +16,6 @@
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 var clone = require("clone");
 var NR_TEST_UTILS = require("nr-test-utils");
 var flowUtil = NR_TEST_UTILS.require("@node-red/runtime/lib/flows/util");
diff --git a/test/unit/@node-red/runtime/lib/index_spec.js b/test/unit/@node-red/runtime/lib/index_spec.js
index f6a506de1..60bdc286b 100644
--- a/test/unit/@node-red/runtime/lib/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/index_spec.js
@@ -28,6 +28,7 @@ var settings = NR_TEST_UTILS.require("@node-red/runtime/lib/settings");
 var util = NR_TEST_UTILS.require("@node-red/util");
 
 var log = NR_TEST_UTILS.require("@node-red/util").log;
+var i18n = NR_TEST_UTILS.require("@node-red/util").i18n;
 
 describe("runtime", function() {
     afterEach(function() {
@@ -43,43 +44,45 @@ describe("runtime", function() {
         delete process.env.NODE_RED_HOME;
     });
     function mockUtil(metrics) {
-
-        return {
-            log:{
-                log: sinon.stub(),
-                warn: sinon.stub(),
-                info: sinon.stub(),
-                trace: sinon.stub(),
-                metric: sinon.stub().returns(!!metrics),
-                _: function() { return "abc"}
-            },
-            i18n: {
-                registerMessageCatalog: function(){
-                    return Promise.resolve();
-                }
-            }
-        }
+        sinon.stub(log,"log",function(){})
+        sinon.stub(log,"warn",function(){})
+        sinon.stub(log,"info",function(){})
+        sinon.stub(log,"trace",function(){})
+        sinon.stub(log,"metric",function(){ return !!metrics })
+        sinon.stub(log,"_",function(){ return "abc"})
+        sinon.stub(i18n,"registerMessageCatalog",function(){ return Promise.resolve()})
+    }
+    function unmockUtil() {
+        log.log.restore && log.log.restore();
+        log.warn.restore && log.warn.restore();
+        log.info.restore && log.info.restore();
+        log.trace.restore && log.trace.restore();
+        log.metric.restore && log.metric.restore();
+        log._.restore && log._.restore();
+        i18n.registerMessageCatalog.restore && i18n.registerMessageCatalog.restore();
     }
     describe("init", function() {
         beforeEach(function() {
             sinon.stub(log,"init",function() {});
             sinon.stub(settings,"init",function() {});
             sinon.stub(redNodes,"init",function() {})
+            mockUtil();
         });
         afterEach(function() {
             log.init.restore();
             settings.init.restore();
             redNodes.init.restore();
+            unmockUtil();
         })
 
         it("initialises components", function() {
-            runtime.init({testSettings: true, httpAdminRoot:"/"},mockUtil());
+            runtime.init({testSettings: true, httpAdminRoot:"/"});
             settings.init.called.should.be.true();
             redNodes.init.called.should.be.true();
         });
 
         it("returns version", function() {
-            runtime.init({testSettings: true, httpAdminRoot:"/"},mockUtil());
+            runtime.init({testSettings: true, httpAdminRoot:"/"});
             return runtime.version().then(version => {
                 /^\d+\.\d+\.\d+(-.*)?$/.test(version).should.be.true();
             });
@@ -98,7 +101,6 @@ describe("runtime", function() {
         var redNodesLoadFlows;
         var redNodesStartFlows;
         var redNodesLoadContextsPlugin;
-        var i18nRegisterMessageCatalog;
 
         beforeEach(function() {
             storageInit = sinon.stub(storage,"init",function(settings) {return Promise.resolve();});
@@ -108,7 +110,7 @@ describe("runtime", function() {
             redNodesLoadFlows = sinon.stub(redNodes,"loadFlows",function() {return Promise.resolve()});
             redNodesStartFlows = sinon.stub(redNodes,"startFlows",function() {});
             redNodesLoadContextsPlugin = sinon.stub(redNodes,"loadContextsPlugin",function() {return Promise.resolve()});
-            i18nRegisterMessageCatalog = sinon.stub(util.i18n,"registerMessageCatalog",function() {return Promise.resolve()});
+            mockUtil();
         });
         afterEach(function() {
             storageInit.restore();
@@ -119,7 +121,7 @@ describe("runtime", function() {
             redNodesLoadFlows.restore();
             redNodesStartFlows.restore();
             redNodesLoadContextsPlugin.restore();
-            i18nRegisterMessageCatalog.restore();
+            unmockUtil();
         });
         it("reports errored/missing modules",function(done) {
             redNodesGetNodeList = sinon.stub(redNodes,"getNodeList", function(cb) {
@@ -128,8 +130,7 @@ describe("runtime", function() {
                     {  module:"module",enabled:true,loaded:false,types:["typeA","typeB"]} // missing
                 ].filter(cb);
             });
-            var util = mockUtil();
-            runtime.init({testSettings: true, httpAdminRoot:"/", load:function() { return Promise.resolve();}},util);
+            runtime.init({testSettings: true, httpAdminRoot:"/", load:function() { return Promise.resolve();}});
             // sinon.stub(console,"log");
             runtime.start().then(function() {
                 // console.log.restore();
@@ -139,9 +140,9 @@ describe("runtime", function() {
                     redNodesLoad.calledOnce.should.be.true();
                     redNodesLoadFlows.calledOnce.should.be.true();
 
-                    util.log.warn.calledWithMatch("Failed to register 1 node type");
-                    util.log.warn.calledWithMatch("Missing node modules");
-                    util.log.warn.calledWithMatch(" - module: typeA, typeB");
+                    log.warn.calledWithMatch("Failed to register 1 node type");
+                    log.warn.calledWithMatch("Missing node modules");
+                    log.warn.calledWithMatch(" - module: typeA, typeB");
                     redNodesCleanModuleList.calledOnce.should.be.true();
                     done();
                 } catch(err) {
@@ -159,16 +160,15 @@ describe("runtime", function() {
                 ].filter(cb);
             });
             var serverInstallModule = sinon.stub(redNodes,"installModule",function(name) { return Promise.resolve({nodes:[]});});
-            var util = mockUtil();
-            runtime.init({testSettings: true, autoInstallModules:true, httpAdminRoot:"/", load:function() { return Promise.resolve();}},util);
+            runtime.init({testSettings: true, autoInstallModules:true, httpAdminRoot:"/", load:function() { return Promise.resolve();}});
             sinon.stub(console,"log");
             runtime.start().then(function() {
                 console.log.restore();
                 try {
-                    util.log.warn.calledWithMatch("Failed to register 2 node types");
-                    util.log.warn.calledWithMatch("Missing node modules");
-                    util.log.warn.calledWithMatch(" - module: typeA, typeB");
-                    util.log.warn.calledWithMatch(" - node-red: typeC, typeD");
+                    log.warn.calledWithMatch("Failed to register 2 node types");
+                    log.warn.calledWithMatch("Missing node modules");
+                    log.warn.calledWithMatch(" - module: typeA, typeB");
+                    log.warn.calledWithMatch(" - node-red: typeC, typeD");
                     redNodesCleanModuleList.calledOnce.should.be.false();
                     serverInstallModule.calledOnce.should.be.true();
                     serverInstallModule.calledWithMatch("module");
@@ -186,14 +186,13 @@ describe("runtime", function() {
                     {  err:"errored",name:"errName" } // error
                 ].filter(cb);
             });
-            var util = mockUtil();
-            runtime.init({testSettings: true, verbose:true, httpAdminRoot:"/", load:function() { return Promise.resolve();}},util);
+            runtime.init({testSettings: true, verbose:true, httpAdminRoot:"/", load:function() { return Promise.resolve();}});
             sinon.stub(console,"log");
             runtime.start().then(function() {
                 console.log.restore();
                 try {
-                    util.log.warn.neverCalledWithMatch("Failed to register 1 node type");
-                    util.log.warn.calledWithMatch("[errName] errored");
+                    log.warn.neverCalledWithMatch("Failed to register 1 node type");
+                    log.warn.calledWithMatch("[errName] errored");
                     done();
                 } catch(err) {
                     done(err);
@@ -204,21 +203,21 @@ describe("runtime", function() {
         it("reports runtime metrics",function(done) {
             var stopFlows = sinon.stub(redNodes,"stopFlows",function() { return Promise.resolve();} );
             redNodesGetNodeList = sinon.stub(redNodes,"getNodeList", function() {return []});
-            var util = mockUtil(true);
+            unmockUtil();
+            mockUtil(true);
             runtime.init(
                 {testSettings: true, runtimeMetricInterval:200, httpAdminRoot:"/", load:function() { return Promise.resolve();}},
                 {},
-                undefined,
-                util);
+                undefined);
             // sinon.stub(console,"log");
             runtime.start().then(function() {
                 // console.log.restore();
                 setTimeout(function() {
                     try {
-                        util.log.log.args.should.have.lengthOf(3);
-                        util.log.log.args[0][0].should.have.property("event","runtime.memory.rss");
-                        util.log.log.args[1][0].should.have.property("event","runtime.memory.heapTotal");
-                        util.log.log.args[2][0].should.have.property("event","runtime.memory.heapUsed");
+                        log.log.args.should.have.lengthOf(3);
+                        log.log.args[0][0].should.have.property("event","runtime.memory.rss");
+                        log.log.args[1][0].should.have.property("event","runtime.memory.heapTotal");
+                        log.log.args[2][0].should.have.property("event","runtime.memory.heapUsed");
                         done();
                     } catch(err) {
                         done(err);
diff --git a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
index df362dc85..532fa96e7 100644
--- a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
@@ -653,42 +653,30 @@ describe('Node', function() {
 
     describe('#log', function() {
         it('produces a log message', function(done) {
-            var n = new RedNode({id:'123',type:'abc',z:'789'});
+            var n = new RedNode({id:'123',type:'abc',z:'789', _flow: {log:function(msg) { loginfo = msg;}}});
             var loginfo = {};
-            sinon.stub(Log, 'log', function(msg) {
-                loginfo = msg;
-            });
             n.log("a log message");
             should.deepEqual({level:Log.INFO, id:n.id,
                                type:n.type, msg:"a log message",z:'789'}, loginfo);
-            Log.log.restore();
             done();
         });
         it('produces a log message with a name', function(done) {
-            var n = new RedNode({id:'123', type:'abc', name:"barney", z:'789'});
+            var n = new RedNode({id:'123', type:'abc', name:"barney", z:'789', _flow: {log:function(msg) { loginfo = msg;}}});
             var loginfo = {};
-            sinon.stub(Log, 'log', function(msg) {
-                loginfo = msg;
-            });
             n.log("a log message");
             should.deepEqual({level:Log.INFO, id:n.id, name: "barney",
                               type:n.type, msg:"a log message",z:'789'}, loginfo);
-            Log.log.restore();
             done();
         });
     });
 
     describe('#warn', function() {
         it('produces a warning message', function(done) {
-            var n = new RedNode({id:'123',type:'abc',z:'789'});
+            var n = new RedNode({id:'123',type:'abc',z:'789', _flow: {log:function(msg) { loginfo = msg;}}});
             var loginfo = {};
-            sinon.stub(Log, 'log', function(msg) {
-                loginfo = msg;
-            });
             n.warn("a warning");
             should.deepEqual({level:Log.WARN, id:n.id,
                               type:n.type, msg:"a warning",z:'789'}, loginfo);
-            Log.log.restore();
             done();
         });
     });
@@ -696,7 +684,8 @@ describe('Node', function() {
     describe('#error', function() {
         it('handles a null error message', function(done) {
             var flow = {
-                handleError: sinon.stub()
+                handleError: sinon.stub(),
+                log:sinon.stub()
             }
             var n = new RedNode({_flow:flow, id:'123',type:'abc',z:'789'});
             var message = {a:1};
@@ -712,7 +701,8 @@ describe('Node', function() {
 
         it('produces an error message', function(done) {
             var flow = {
-                handleError: sinon.stub()
+                handleError: sinon.stub(),
+                log:sinon.stub()
             }
             var n = new RedNode({_flow:flow, id:'123',type:'abc',z:'789'});
             var message = {a:2};
diff --git a/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js b/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js
index 63050a8b9..5e4bc8094 100644
--- a/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/credentials_spec.js
@@ -16,7 +16,6 @@
 
 var should = require("should");
 var sinon = require("sinon");
-var when = require("when");
 var util = require("util");
 
 var NR_TEST_UTILS = require("nr-test-utils");
@@ -228,11 +227,11 @@ describe('red/runtime/nodes/credentials', function() {
                 },
                 set: function(key,value) {
                     settings[key] = value;
-                    return when.resolve();
+                    return Promise.resolve();
                 },
                 delete: function(key) {
                     delete settings[key];
-                    return when.resolve();
+                    return Promise.resolve();
                 }
             }
         }
diff --git a/test/unit/@node-red/runtime/lib/nodes/index_spec.js b/test/unit/@node-red/runtime/lib/nodes/index_spec.js
index 7a4992624..a73e0a246 100644
--- a/test/unit/@node-red/runtime/lib/nodes/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/index_spec.js
@@ -17,7 +17,6 @@
 var should = require("should");
 var fs = require('fs-extra');
 var path = require('path');
-var when = require("when");
 var sinon = require('sinon');
 var inherits = require("util").inherits;
 
@@ -47,11 +46,11 @@ describe("red/nodes/index", function() {
     var testCredentials = {"tab1":{"b":1, "c":"2", "d":"$(foo)"}};
     var storage = {
         getFlows: function() {
-            return when({red:123,flows:testFlows,credentials:testCredentials});
+            return Promise.resolve({red:123,flows:testFlows,credentials:testCredentials});
         },
         saveFlows: function(conf) {
             should.deepEqual(testFlows, conf.flows);
-            return when.resolve(123);
+            return Promise.resolve(123);
         }
     };
 
@@ -182,12 +181,12 @@ describe("red/nodes/index", function() {
                 fs.remove(userDir,function(err) {
                     fs.mkdir(userDir,function() {
                         sinon.stub(index, 'load', function() {
-                            return when.promise(function(resolve,reject){
+                            return new Promise(function(resolve,reject){
                                 resolve([]);
                             });
                         });
                         sinon.stub(localfilesystem, 'getCredentials', function() {
-                            return when.promise(function(resolve,reject) {
+                            return new Promise(function(resolve,reject) {
                                 resolve({"tab1":{"b":1,"c":2}});
                             });
                         }) ;
@@ -282,7 +281,7 @@ describe("red/nodes/index", function() {
                 }
             });
             sinon.stub(registry,"disableNode",function(id) {
-                return when.resolve(randomNodeInfo);
+                return Promise.resolve(randomNodeInfo);
             });
         });
         afterEach(function() {
diff --git a/test/unit/@node-red/runtime/lib/plugins_spec.js b/test/unit/@node-red/runtime/lib/plugins_spec.js
new file mode 100644
index 000000000..a78de643c
--- /dev/null
+++ b/test/unit/@node-red/runtime/lib/plugins_spec.js
@@ -0,0 +1,13 @@
+const should = require("should");
+const sinon = require("sinon");
+const NR_TEST_UTILS = require("nr-test-utils");
+
+const plugins = NR_TEST_UTILS.require("@node-red/runtime/lib/plugins");
+
+describe("runtime/plugins",function() {
+
+    it.skip("delegates all functions to registry module", function() {
+        // There's no easy way to test this as we can't stub the registry functions
+        // before the plugin module gets a reference to them
+    })
+});
diff --git a/test/unit/@node-red/runtime/lib/storage/index_spec.js b/test/unit/@node-red/runtime/lib/storage/index_spec.js
index 3ede68c86..dd9fa6e9b 100644
--- a/test/unit/@node-red/runtime/lib/storage/index_spec.js
+++ b/test/unit/@node-red/runtime/lib/storage/index_spec.js
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var when = require("when");
 var should = require("should");
 var paff = require('path');
 
@@ -79,16 +78,16 @@ describe("red/storage/index", function() {
                 },
                 getFlows : function() {
                     calledFlagGetFlows = true;
-                    return when.resolve([]);
+                    return Promise.resolve([]);
                 },
                 saveFlows : function (flows) {
                     flows.should.be.an.Array();
                     flows.should.have.lengthOf(0);
-                    return when.resolve("");
+                    return Promise.resolve("");
                 },
                 getCredentials : function() {
                     calledFlagGetCredentials = true;
-                    return when.resolve({});
+                    return Promise.resolve({});
                 },
                 saveCredentials : function(credentials) {
                     credentials.should.be.true();
@@ -147,7 +146,7 @@ describe("red/storage/index", function() {
         storage.getLibraryEntry(true, "name");
         storage.saveLibraryEntry(true, "name", true, true);
 
-        when.settle(promises).then(function() {
+        Promise.all(promises).then(function() {
             try {
                 calledInit.should.be.true();
                 calledFlagGetFlows.should.be.true();
@@ -174,11 +173,11 @@ describe("red/storage/index", function() {
                 getLibraryEntry : function(type, path) {
                     if (type === "flows") {
                         if (path === "/" || path === "\\") {
-                            return when.resolve(["a",{fn:"test.json"}]);
+                            return Promise.resolve(["a",{fn:"test.json"}]);
                         } else if (path == "/a" || path == "\\a") {
-                            return when.resolve([{fn:"test2.json"}]);
+                            return Promise.resolve([{fn:"test2.json"}]);
                         } else if (path == paff.join("","a","test2.json")) {
-                            return when.resolve("test content");
+                            return Promise.resolve("test content");
                         }
                     }
                 },
@@ -187,7 +186,7 @@ describe("red/storage/index", function() {
                     savePath = path;
                     saveContent = body;
                     saveMeta = meta;
-                    return when.resolve();
+                    return Promise.resolve();
                 }
         };
 
diff --git a/test/unit/@node-red/runtime/lib/events_spec.js b/test/unit/@node-red/util/lib/events_spec.js
similarity index 88%
rename from test/unit/@node-red/runtime/lib/events_spec.js
rename to test/unit/@node-red/util/lib/events_spec.js
index 09b47693d..09f5d2ae0 100644
--- a/test/unit/@node-red/runtime/lib/events_spec.js
+++ b/test/unit/@node-red/util/lib/events_spec.js
@@ -17,9 +17,9 @@ var should = require("should");
 
 var NR_TEST_UTILS = require("nr-test-utils");
 
-describe("runtime/events", function() {
+describe("@node-red/util/events", function() {
     it('can be required without errors', function() {
-        NR_TEST_UTILS.require("@node-red/runtime/lib/events");
+        NR_TEST_UTILS.require("@node-red/util/lib/events");
     });
     it.skip('more tests needed', function(){})
 });
diff --git a/test/unit/@node-red/runtime/lib/exec_spec.js b/test/unit/@node-red/util/lib/exec_spec.js
similarity index 90%
rename from test/unit/@node-red/runtime/lib/exec_spec.js
rename to test/unit/@node-red/util/lib/exec_spec.js
index 1e37b7cc1..887938d16 100644
--- a/test/unit/@node-red/runtime/lib/exec_spec.js
+++ b/test/unit/@node-red/util/lib/exec_spec.js
@@ -16,30 +16,31 @@
 var should = require("should");
 var sinon = require("sinon");
 var path = require("path");
-var events = require("events");
+var EventEmitter = require("events").EventEmitter;
 
 
 var child_process = require('child_process');
 
 var NR_TEST_UTILS = require("nr-test-utils");
 
-var exec = NR_TEST_UTILS.require("@node-red/runtime/lib/exec");
+var events = NR_TEST_UTILS.require("@node-red/util/lib/events");
+var exec = NR_TEST_UTILS.require("@node-red/util/lib/exec");
 
 describe("runtime/exec", function() {
     var logEvents;
     var mockProcess;
+    const eventLogHandler = function(ev) {
+        logEvents.push(ev);
+    }
 
     beforeEach(function() {
-        var logEventHandler = new events.EventEmitter();
-        logEvents = [];
-        logEventHandler.on('event-log', function(ev) {
-            logEvents.push(ev);
-        });
-        exec.init({events:logEventHandler});
 
-        mockProcess = new events.EventEmitter();
-        mockProcess.stdout = new events.EventEmitter();
-        mockProcess.stderr = new events.EventEmitter();
+        logEvents = [];
+        events.on("event-log", eventLogHandler);
+
+        mockProcess = new EventEmitter();
+        mockProcess.stdout = new EventEmitter();
+        mockProcess.stderr = new EventEmitter();
         sinon.stub(child_process,'spawn',function(command,args,options) {
             mockProcess._args = {command,args,options};
             return mockProcess;
@@ -47,6 +48,7 @@ describe("runtime/exec", function() {
     });
 
     afterEach(function() {
+        events.removeListener("event-log", eventLogHandler);
         if (child_process.spawn.restore) {
             child_process.spawn.restore();
         }
diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js
index c4a64d53f..6db93f311 100644
--- a/test/unit/@node-red/util/lib/util_spec.js
+++ b/test/unit/@node-red/util/lib/util_spec.js
@@ -164,6 +164,13 @@ describe("@node-red/util/util", function() {
             var v2 = util.getMessageProperty({a:"foo"},"a");
             v2.should.eql("foo");
         });
+        it('retrieves a nested property', function() {
+            var v = util.getMessageProperty({a:"foo",b:{foo:1,bar:2}},"msg.b[msg.a]");
+            v.should.eql(1);
+            var v2 = util.getMessageProperty({a:"bar",b:{foo:1,bar:2}},"b[msg.a]");
+            v2.should.eql(2);
+        });
+
         it('should return undefined if property does not exist', function() {
             var v = util.getMessageProperty({a:"foo"},"msg.b");
             should.not.exist(v);
@@ -331,7 +338,18 @@ describe("@node-red/util/util", function() {
             msg.a[0].should.eql(1);
             msg.a[1].should.eql(3);
         })
-
+        it('handles nested message property references', function() {
+            var obj = {a:"foo",b:{}};
+            var result = util.setObjectProperty(obj,"b[msg.a]","bar");
+            result.should.be.true();
+            obj.b.should.have.property("foo","bar");
+        });
+        it('handles nested message property references', function() {
+            var obj = {a:"foo",b:{"foo":[0,0,0]}};
+            var result = util.setObjectProperty(obj,"b[msg.a][2]","bar");
+            result.should.be.true();
+            obj.b.foo.should.eql([0,0,"bar"])
+        });
     });
 
     describe('evaluateNodeProperty', function() {
@@ -459,13 +477,24 @@ describe("@node-red/util/util", function() {
             // console.log(result);
             result.should.eql(expected);
         }
-
-        function testInvalid(input) {
+        function testABCWithMessage(input,msg,expected) {
+            var result = util.normalisePropertyExpression(input,msg);
+            // console.log("+",input);
+            // console.log(result);
+            result.should.eql(expected);
+        }
+        function testInvalid(input,msg) {
             /*jshint immed: false */
             (function() {
-                util.normalisePropertyExpression(input);
+                util.normalisePropertyExpression(input,msg);
             }).should.throw();
         }
+        function testToString(input,msg,expected) {
+            var result = util.normalisePropertyExpression(input,msg,true);
+            console.log("+",input);
+            console.log(result);
+            result.should.eql(expected);
+        }
         it('pass a.b.c',function() { testABC('a.b.c',['a','b','c']); })
         it('pass a["b"]["c"]',function() { testABC('a["b"]["c"]',['a','b','c']); })
         it('pass a["b"].c',function() { testABC('a["b"].c',['a','b','c']); })
@@ -479,12 +508,25 @@ describe("@node-red/util/util", function() {
         it("pass 'a.b'[1]",function() { testABC("'a.b'[1]",['a.b',1]); })
         it("pass 'a.b'.c",function() { testABC("'a.b'.c",['a.b','c']); })
 
+        it("pass a[msg.b]",function() { testABC("a[msg.b]",["a",["msg","b"]]); })
+        it("pass a[msg[msg.b]]",function() { testABC("a[msg[msg.b]]",["a",["msg",["msg","b"]]]); })
+        it("pass a[msg.b]",function() { testABC("a[msg.b]",["a",["msg","b"]]); })
+        it("pass a[msg.b]",function() { testABC("a[msg.b]",["a",["msg","b"]]); })
+        it("pass a[msg['b]\"[']]",function() { testABC("a[msg['b]\"[']]",["a",["msg","b]\"["]]); })
+        it("pass a[msg['b][']]",function() { testABC("a[msg['b][']]",["a",["msg","b]["]]); })
+        it("pass b[msg.a][2]",function() { testABC("b[msg.a][2]",["b",["msg","a"],2])})
+
+        it("pass b[msg.a][2] (with message)",function() { testABCWithMessage("b[msg.a][2]",{a: "foo"},["b","foo",2])})
 
         it('pass a.$b.c',function() { testABC('a.$b.c',['a','$b','c']); })
         it('pass a["$b"].c',function() { testABC('a["$b"].c',['a','$b','c']); })
         it('pass a._b.c',function() { testABC('a._b.c',['a','_b','c']); })
         it('pass a["_b"].c',function() { testABC('a["_b"].c',['a','_b','c']); })
 
+        it("pass a['a.b[0]'].c",function() { testToString("a['a.b[0]'].c",null,'a["a.b[0]"]["c"]'); })
+        it("pass a.b.c",function() { testToString("a.b.c",null,'a["b"]["c"]'); })
+        it('pass a[msg.c][0]["fred"]',function() { testToString('a[msg.c][0]["fred"]',{c:"123"},'a["123"][0]["fred"]'); })
+
         it("fail a'b'.c",function() { testInvalid("a'b'.c"); })
         it("fail a['b'.c",function() { testInvalid("a['b'.c"); })
         it("fail a[]",function() { testInvalid("a[]"); })
@@ -505,6 +547,12 @@ describe("@node-red/util/util", function() {
         it("fail a['']",function() { testInvalid("a['']"); })
         it("fail 'a.b'c",function() { testInvalid("'a.b'c"); })
         it("fail <blank>",function() { testInvalid("");})
+        it("fail a[b]",function() { testInvalid("a[b]"); })
+        it("fail a[msg.]",function() { testInvalid("a[msg.]"); })
+        it("fail a[msg[]",function() { testInvalid("a[msg[]"); })
+        it("fail a[msg.[]]",function() { testInvalid("a[msg.[]]"); })
+        it("fail a[msg['af]]",function() { testInvalid("a[msg['af]]"); })
+        it("fail b[msg.undefined][2] (with message)",function() { testInvalid("b[msg.undefined][2]",{})})
 
     });
 
@@ -983,4 +1031,5 @@ describe("@node-red/util/util", function() {
 
         });
     });
+
 });