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 5cadb805f..f446b171c 100644
--- 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
@@ -416,6 +416,7 @@
         },
         "errors": {
             "noNodesSelected": "<strong>Cannot create subflow</strong>: no nodes selected",
+            "acrossMultipleGroups": "Cannot create subflow across multiple groups",
             "multipleInputsToSelection": "<strong>Cannot create subflow</strong>: multiple inputs to selection"
         }
     },
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 37b03dadb..4ea9a3b9f 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
@@ -416,6 +416,7 @@
         },
         "errors": {
             "noNodesSelected": "<strong>サブフローを作成できません</strong>: ノードが選択されていません",
+            "acrossMultipleGroups": "複数のグループをまたがるサブフローは作成できません",
             "multipleInputsToSelection": "<strong>サブフローを作成できません</strong>: 複数の入力が選択されています"
         }
     },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
index a081656fc..fdf4fe1ef 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js
@@ -249,7 +249,10 @@ RED.keyboard = (function() {
         // One exception is shortcuts that include both Cmd and Ctrl. We don't
         // support them - but we need to make sure we don't block browser-specific
         // shortcuts (such as Cmd-Ctrl-F for fullscreen).
-        if ((evt.ctrlKey || evt.metaKey) && (evt.ctrlKey !== evt.metaKey)) {
+        if (evt.ctrlKey && evt.metaKey) {
+            return null; // dont handle both cmd+ctrl - let browser handle this
+        }
+        if (evt.ctrlKey || evt.metaKey) {
             slot = slot.ctrl;
         }
         if (slot && evt.shiftKey) {
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 da38e6054..a06f8bca4 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
@@ -667,7 +667,7 @@ RED.subflow = (function() {
         for (i=0; i<nodeList.length;i++) {
             if (nodeList[i].g && !includedGroups.has(nodeList[i].g)) {
                 if (containingGroup !== nodeList[i].g) {
-                    RED.notify("Cannot create subflow across multiple groups","error");
+                    RED.notify(RED._("subflow.errors.acrossMultipleGroups"), "error");
                     return;
                 }
             }
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index ebe22d65c..c10a53827 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -103,6 +103,7 @@
             } else if (type === "istype") {
                 r.v = rule.find(".node-input-rule-type-value").typedInput('type');
                 r.vt = rule.find(".node-input-rule-type-value").typedInput('type');
+                r.vt = (r.vt === "number") ? "num" : "str";
             } else if (type === "jsonata_exp") {
                 r.v = rule.find(".node-input-rule-exp-value").typedInput('value');
                 r.vt = rule.find(".node-input-rule-exp-value").typedInput('type');
diff --git a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
index eb0aeaf47..7cce956bb 100644
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.html
@@ -93,7 +93,7 @@
 
     <div class="form-row">
         <input type="checkbox" id="node-input-insecureHTTPParser" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-insecureHTTPParser", style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
+        <label for="node-input-insecureHTTPParser" style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
     </div>
 
 
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
index 6f72a5c33..bf0fb5c24 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/common/20-inject.html
@@ -36,5 +36,5 @@ greater than one day you should consider using a scheduler node that can cope wi
 <p><b>Note</b>: The <i>"Interval between times"</i> and <i>"at a specific time"</i> options use the standard cron system.
 This means that 20 minutes will be at the next hour, 20 minutes past and 40 minutes past - not in 20 minutes time.
 If you want every 20 minutes from now - use the <i>"interval"</i> option.</p>
-<p><b>Note</b>: To include a newline in a string you must use a Function node to create the payload.</p>
+<p><b>Note</b>: To include a newline in a string you must use the Function or Template node to create the payload.</p>
 </script>
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
index f6706844e..060a03f33 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/common/20-inject.html
@@ -30,5 +30,5 @@
 <p>また、フロー開始の際に一度だけメッセージを送出させることもできます。</p>
 <p>「<i>時間間隔</i>」に指定可能な値の最大値は、約596時間(もしくは24日)です。一日より長い間隔を扱いたい場合は、電源停止や再起動にも対応可能なスケジューラノードの利用を検討すると良いでしょう。</p>
 <p><b>注</b>:「<i>指定した時間間隔、日時</i>」と「<i>指定した日時</i>」オプションは標準的なcronシステムを内部で利用します。したがって「20分」という指定は、その時点から20分後ではなく、毎時きっかり、20分、40分を意味します。現時刻から20分毎を指定するには「<i>指定した時間間隔</i>」オプションを用います。</p>
-<p><b>注</b>: 文字列に改行を含めたい場合は、functionノードを使ってペイロードを設定してください。</p>
+<p><b>注</b>: 文字列に改行を含めたい場合は、functionノードまたはtemplateノードを使ってペイロードを設定してください。</p>
 </script>
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 0e788f43c..ce2dab9ef 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -783,7 +783,7 @@ function handlePreRoute(flow, sendEvent, reportError) {
             return;
         } else if (err !== false) {
             sendEvent.destination.node = flow.getNode(sendEvent.destination.id);
-            if (sendEvent.destination.node) {
+            if (sendEvent.destination.node && typeof sendEvent.destination.node === 'object') {
                 if (sendEvent.cloneMessage) {
                     sendEvent.msg = redUtil.cloneMessage(sendEvent.msg);
                 }