diff --git a/CHANGELOG.md b/CHANGELOG.md
index 934f1ad60..8e6de1ce2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+#### 0.20.7: Maintenance Release
+
+ - Update jsonata to 1.6.5 which should fix #2183
+ - Ensure the subflow stop promise is waiting for before restarting
+ - Properly escape node types in palette
+
 #### 0.20.6: Maintenance Release
 
  - Revealing node position needs to account for zoom level Fixes #2172
diff --git a/package.json b/package.json
index 61e546acf..9f2770acb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -37,13 +37,13 @@
         "cron": "1.7.1",
         "denque": "1.4.1",
         "express": "4.17.1",
-        "express-session": "1.16.1",
-        "fs-extra": "8.0.1",
+        "express-session": "1.16.2",
+        "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
-        "hash-sum": "1.0.2",
+        "hash-sum": "2.0.0",
         "https-proxy-agent": "2.2.1",
         "i18next": "15.1.0",
-        "iconv-lite": "0.4.24",
+        "iconv-lite": "0.5.0",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
@@ -54,21 +54,21 @@
         "mqtt": "2.18.8",
         "multer": "1.4.1",
         "mustache": "3.0.1",
-        "node-red-node-email": "^1.4.0",
+        "node-red-node-email": "^1.6.2",
         "node-red-node-feedparser": "^0.1.14",
         "node-red-node-rbe": "^0.2.4",
         "node-red-node-sentiment": "^0.1.3",
         "node-red-node-tail": "^0.0.2",
-        "node-red-node-twitter": "^1.1.4",
+        "node-red-node-twitter": "^1.1.5",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.2",
         "passport": "0.4.0",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "raw-body": "2.4.0",
+        "raw-body": "2.4.1",
         "request": "2.88.0",
-        "semver": "6.1.1",
+        "semver": "6.2.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8",
         "ws": "6.2.1",
@@ -78,7 +78,7 @@
         "bcrypt": "3.0.6"
     },
     "devDependencies": {
-        "grunt": "~1.0.3",
+        "grunt": "~1.0.4",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.3.2",
         "grunt-concurrent": "~2.3.1",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 320f9da25..60322caeb 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,13 +16,13 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "0.20.6",
-        "@node-red/editor-client": "0.20.6",
+        "@node-red/util": "0.20.7",
+        "@node-red/editor-client": "0.20.7",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.0",
         "clone": "2.1.2",
         "cors": "2.8.5",
-        "express-session": "1.16.1",
+        "express-session": "1.16.2",
         "express": "4.17.1",
         "memorystore": "1.6.1",
         "mime": "2.4.4",
@@ -35,6 +35,6 @@
         "ws": "6.2.1"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.5"
+        "bcrypt": "3.0.6"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index eca94372f..5c04db292 100644
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 1b08e1ac3..7750cb826 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -24,9 +24,9 @@
         "cors": "2.8.5",
         "cron": "1.7.1",
         "denque": "1.4.1",
-        "fs-extra": "8.0.1",
+        "fs-extra": "8.1.0",
         "fs.notify": "0.0.4",
-        "hash-sum": "1.0.2",
+        "hash-sum": "2.0.0",
         "https-proxy-agent": "2.2.1",
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
@@ -35,10 +35,10 @@
         "multer": "1.4.1",
         "mustache": "3.0.1",
         "on-headers": "1.0.2",
-        "raw-body": "2.4.0",
+        "raw-body": "2.4.1",
         "request": "2.88.0",
         "ws": "6.2.1",
         "xml2js": "0.4.19",
-        "iconv-lite": "0.4.24"
+        "iconv-lite": "0.5.0"
     }
 }
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 0dd7f3a26..5ce8b5b5b 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "0.20.6",
-        "semver": "6.1.1",
+        "@node-red/util": "0.20.7",
+        "semver": "6.2.0",
         "uglify-js": "3.6.0",
         "when": "3.7.8"
     }
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 850f3b647..9ba954154 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,11 +16,11 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "0.20.6",
-        "@node-red/util": "0.20.6",
+        "@node-red/registry": "0.20.7",
+        "@node-red/util": "0.20.7",
         "clone": "2.1.2",
         "express": "4.17.1",
-        "fs-extra": "8.0.1",
+        "fs-extra": "8.1.0",
         "json-stringify-safe": "5.0.1",
         "when": "3.7.8"
     }
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 35a8acebd..03386f063 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 9ef2fc749..e7dcdceb4 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "0.20.6",
+    "version": "0.20.7",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,25 +31,25 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "0.20.6",
-        "@node-red/runtime": "0.20.6",
-        "@node-red/util": "0.20.6",
-        "@node-red/nodes": "0.20.6",
+        "@node-red/editor-api": "0.20.7",
+        "@node-red/runtime": "0.20.7",
+        "@node-red/util": "0.20.7",
+        "@node-red/nodes": "0.20.7",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",
-        "fs-extra": "8.0.1",
-        "node-red-node-email": "^1.4.0",
+        "fs-extra": "8.1.0",
+        "node-red-node-email": "^1.6.2",
         "node-red-node-feedparser": "^0.1.14",
         "node-red-node-rbe": "^0.2.4",
         "node-red-node-sentiment": "^0.1.3",
         "node-red-node-tail": "^0.0.2",
-        "node-red-node-twitter": "^1.1.4",
+        "node-red-node-twitter": "^1.1.5",
         "nopt": "4.0.1",
-        "semver": "6.1.1"
+        "semver": "6.2.0"
     },
     "optionalDependencies": {
-        "bcrypt": "3.0.5"
+        "bcrypt": "3.0.6"
     },
     "engines": {
         "node": ">=8"
diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js
index 9a32cef7a..00caa9867 100644
--- a/test/nodes/core/io/21-httprequest_spec.js
+++ b/test/nodes/core/io/21-httprequest_spec.js
@@ -1291,6 +1291,7 @@ describe('HTTP Request Node', function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
+                    console.log(msg.payload);
                     try {
                         msg.payload.headers.should.have.property('content-type').which.startWith('application/json');
                         msg.payload.headers.should.not.have.property('x-node-red-request-node');
@@ -1301,7 +1302,11 @@ describe('HTTP Request Node', function() {
                 });
                 // Pass in a headers property with an unmodified x-node-red-request-node hash
                 // This should cause the node to ignore the headers
-                n1.receive({payload:{foo:"bar"}, headers: { 'content-type': 'text/plain', "x-node-red-request-node":"67690139"}});
+
+                var headers = { 'content-type': 'text/plain' };
+                headers['x-node-red-request-node'] = require("hash-sum")(headers);
+
+                n1.receive({payload:{foo:"bar"}, headers: headers});
             });
         });