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 40d19a811..2a7b440f2 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
@@ -2406,6 +2406,13 @@ RED.nodes = (function() {
             } else {
                 delete n.g
             }
+            // If importing into a subflow, ensure an outbound-link doesn't get added
+            if (activeSubflow && /^link /.test(n.type) && n.links) {
+                n.links = n.links.filter(function(id) {
+                    const otherNode = node_map[id] || RED.nodes.node(id);
+                    return (otherNode && otherNode.z === activeWorkspace);
+                });
+            }
             for (var d3 in n._def.defaults) {
                 if (n._def.defaults.hasOwnProperty(d3)) {
                     if (n._def.defaults[d3].type) {
@@ -2429,14 +2436,6 @@ RED.nodes = (function() {
                     }
                 }
             }
-            // If importing into a subflow, ensure an outbound-link doesn't
-            // get added
-            if (activeSubflow && /^link /.test(n.type) && n.links) {
-                n.links = n.links.filter(function(id) {
-                    const otherNode = node_map[id] || RED.nodes.node(id);
-                    return (otherNode && otherNode.z === activeWorkspace)
-                });
-            }
         }
         for (i=0;i<new_subflows.length;i++) {
             n = new_subflows[i];
diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Group.js b/packages/node_modules/@node-red/runtime/lib/flows/Group.js
index 90d93cf45..589cdf115 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/Group.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Group.js
@@ -1,5 +1,6 @@
 const flowUtil = require("./util");
 const credentials = require("../nodes/credentials");
+const clone = require("clone");
 
 /**
  * This class represents a group within the runtime.
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 4354c92ae..231f39515 100644
--- a/packages/node_modules/@node-red/runtime/lib/flows/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/index.js
@@ -462,9 +462,8 @@ function stop(type,diff,muteLog,isDeploy) {
     if (type === 'nodes') {
         stopList = diff.changed.concat(diff.removed);
     } else if (type === 'flows') {
-        stopList = diff.changed.concat(diff.removed).concat(diff.linked);
+        stopList = diff.changed.concat(diff.removed).concat(diff.linked).concat(diff.rewired);
     }
-
     events.emit("flows:stopping",{config: activeConfig, type: type, diff: diff})
 
     // Stop the global flow object last
diff --git a/test/unit/@node-red/runtime/lib/flows/Group_spec.js b/test/unit/@node-red/runtime/lib/flows/Group_spec.js
index b547b1c77..1b22b962d 100644
--- a/test/unit/@node-red/runtime/lib/flows/Group_spec.js
+++ b/test/unit/@node-red/runtime/lib/flows/Group_spec.js
@@ -16,6 +16,31 @@ describe('Group', function () {
             group.getSetting("NR_GROUP_NAME").should.equal("g1")
             group.getSetting("NR_GROUP_ID").should.equal("group1")
         })
+        it("returns cloned env var property", async function () {
+            const group = new Group({
+                getSetting: v => v+v
+            }, {
+                name: "g1",
+                id: "group1",
+                env: [
+                    {
+                        name: 'jsonEnvVar',
+                        type: 'json',
+                        value: '{"a":1}'
+                    }
+                ]
+            })
+            await group.start()
+            const result = group.getSetting('jsonEnvVar')
+            result.should.have.property('a', 1)
+            result.a = 2
+            result.b = 'hello'
+
+            const result2 = group.getSetting('jsonEnvVar')
+            result2.should.have.property('a', 1)
+            result2.should.not.have.property('b')
+
+        })
         it("delegates to parent if not found", async function () {
             const group = new Group({
                 getSetting: v => v+v