diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.js b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
index fe84d487d..cfd20b6ea 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.js
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.js
@@ -19,7 +19,11 @@ module.exports = function(RED) {
         if (this.tosidebar === undefined) { this.tosidebar = true; }
         this.severity = n.severity || 40;
         this.active = (n.active === null || typeof n.active === "undefined") || n.active;
-        this.status({});
+        if (this.tostatus) {
+            this.oldStatus = {fill:"grey", shape:this.active?"dot":"ring"};
+            this.status(this.oldStatus);
+        }
+        else { this.status({}); }
 
         var node = this;
         var levels = {
@@ -122,7 +126,7 @@ module.exports = function(RED) {
             if (state === "enable") {
                 node.active = true;
                 res.sendStatus(200);
-                if (node.tostatus) { node.status({}); }
+                if (node.tostatus) { node.status({fill:"grey", shape:"dot"}); }
             } else if (state === "disable") {
                 node.active = false;
                 res.sendStatus(201);
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.html b/packages/node_modules/@node-red/nodes/core/core/80-function.html
index e406e9d16..13ef20db0 100644
--- a/packages/node_modules/@node-red/nodes/core/core/80-function.html
+++ b/packages/node_modules/@node-red/nodes/core/core/80-function.html
@@ -53,12 +53,14 @@
     <p>The Catch node can also be used to handle errors. To invoke a Catch node,
     pass <code>msg</code> as a second argument to <code>node.error</code>:</p>
     <pre>node.error("Error",msg);</pre>
-    <h4>Referring Node Information</h4>
+    <h4>Accessing Node Information</h4>
     <p>In the function block, id and name of the node can be referenced using the following properties:</p>
     <ul>
         <li><code>node.id</code> - id of the node</li>
         <li><code>node.name</code> - name of the node</li>
     </ul>
+    <h4>Using environment variables</h4>
+    <p>Environment variables can be accessed using <code>env.get("MY_ENV_VAR")</code>.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/packages/node_modules/@node-red/nodes/core/core/80-function.js b/packages/node_modules/@node-red/nodes/core/core/80-function.js
index 931958c7b..0e1efbdcd 100644
--- a/packages/node_modules/@node-red/nodes/core/core/80-function.js
+++ b/packages/node_modules/@node-red/nodes/core/core/80-function.js
@@ -156,6 +156,13 @@ module.exports = function(RED) {
                     return node.context().global.keys.apply(node,arguments);
                 }
             },
+            env: {
+                get: function(envVar) {
+                    // For now, just return the env var. This will eventually
+                    // also return project settings and subflow instance properties
+                    return process.env[envVar]
+                }
+            },
             setTimeout: function () {
                 var func = arguments[0];
                 var timerId;
diff --git a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
index 26593647a..47b4bed7c 100644
--- a/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
+++ b/packages/node_modules/@node-red/nodes/core/io/31-tcpin.js
@@ -33,9 +33,7 @@ module.exports = function(RED) {
      */
     const enqueue = (queue, item) => {
         // drop msgs from front of queue if size is going to be exceeded
-        if (queue.size() === msgQueueSize) {
-            queue.shift();
-        }
+        if (queue.size() === msgQueueSize) { queue.shift(); }
         queue.push(item);
         return queue;
     };
@@ -646,7 +644,7 @@ module.exports = function(RED) {
             }
             else if (!clients[connection_id].connecting && clients[connection_id].connected) {
                 if (clients[connection_id] && clients[connection_id].client) {
-                    clients[connection_id].client.write(dequeue(clients[connection_id].msgQueue));
+                    clients[connection_id].client.write(dequeue(clients[connection_id].msgQueue).payload);
                 }
             }
         });
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js
index eb0bec63c..4e1e51e47 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-JSON.js
@@ -19,6 +19,7 @@ module.exports = function(RED) {
     const Ajv = require('ajv');
     const ajv = new Ajv({allErrors: true, schemaId: 'auto'});
     ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+    ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-06.json'));
 
     function JSONNode(n) {
         RED.nodes.createNode(this,n);
@@ -29,6 +30,7 @@ module.exports = function(RED) {
         this.compiledSchema = null;
 
         var node = this;
+
         this.on("input", function(msg) {
             var validate = false;
             if (msg.schema) {
@@ -65,7 +67,17 @@ module.exports = function(RED) {
                         }
                         catch(e) { node.error(e.message,msg); }
                     } else {
-                        node.send(msg);
+                        // If node.action is str and value is str
+                        if (validate) {
+                            if (this.compiledSchema(JSON.parse(msg[node.property]))) {
+                                node.send(msg);
+                            } else {
+                                msg.schemaError = this.compiledSchema.errors;
+                                node.error(`${RED._("json.errors.schema-error")}: ${ajv.errorsText(this.compiledSchema.errors)}`, msg);
+                            }
+                        } else {
+                            node.send(msg);
+                        }
                     }
                 }
                 else if (typeof value === "object") {
@@ -84,13 +96,22 @@ module.exports = function(RED) {
                                     RED.util.setMessageProperty(msg,node.property,JSON.stringify(value,null,node.indent));
                                     node.send(msg);
                                 }
-
                             }
                             catch(e) { node.error(RED._("json.errors.dropped-error")); }
                         }
                         else { node.warn(RED._("json.errors.dropped-object")); }
                     } else {
-                        node.send(msg);
+                        // If node.action is obj and value is object
+                        if (validate) {
+                            if (this.compiledSchema(value)) {
+                                node.send(msg);
+                            } else {
+                                msg.schemaError = this.compiledSchema.errors;
+                                node.error(`${RED._("json.errors.schema-error")}: ${ajv.errorsText(this.compiledSchema.errors)}`, msg);
+                            }
+                        } else {
+                            node.send(msg);
+                        }
                     }
                 }
                 else { node.warn(RED._("json.errors.dropped")); }
diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
index a7e288c1f..5f951fc0b 100644
--- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js
+++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
@@ -24,7 +24,7 @@ var i18n = require("@node-red/util").i18n; // TODO: separate module
 
 var settings;
 var disableNodePathScan = false;
-var iconFileExtensions = [".png", ".gif"];
+var iconFileExtensions = [".png", ".gif", ".svg"];
 
 function init(runtime) {
     settings = runtime.settings;
diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js
index febf64590..44b37b4dd 100644
--- a/test/nodes/core/core/80-function_spec.js
+++ b/test/nodes/core/core/80-function_spec.js
@@ -1249,6 +1249,36 @@ describe('function node', function() {
         });
     });
 
+    it('should allow accessing env vars', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],func:"msg.payload = env.get('_TEST_FOO_'); return msg;"},
+        {id:"n2", type:"helper"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            var count = 0;
+            delete process.env._TEST_FOO_;
+
+            n2.on("input", function(msg) {
+                try {
+                    if (count === 0) {
+                        msg.should.have.property('payload', undefined);
+                        process.env._TEST_FOO_ = "hello";
+                        count++;
+                        n1.receive({payload:"foo",topic: "bar"});
+                    } else {
+                        msg.should.have.property('payload', "hello");
+                        done();
+                    }
+                } catch(err) {
+                    done(err);
+                } finally {
+                    delete process.env._TEST_FOO_;
+                }
+            });
+            n1.receive({payload:"foo",topic: "bar"});
+        });
+    });
+
     describe('Logger', function () {
         it('should log an Info Message', function (done) {
             var flow = [{id: "n1", type: "function", wires: [["n2"]], func: "node.log('test');"}];
diff --git a/test/nodes/core/hardware/36-rpi-gpio_spec.js b/test/nodes/core/hardware/36-rpi-gpio_spec.js
index 9de6dca5a..7c7fb1cd1 100644
--- a/test/nodes/core/hardware/36-rpi-gpio_spec.js
+++ b/test/nodes/core/hardware/36-rpi-gpio_spec.js
@@ -15,7 +15,8 @@
  **/
 
 var should = require("should");
-var rpi = require("nr-test-utils").require("@node-red/nodes/core/hardware/36-rpi-gpio.js");
+var rpiNode = require("nr-test-utils").require("@node-red/nodes/core/hardware/36-rpi-gpio.js");
+var statusNode = require("nr-test-utils").require("@node-red/nodes/core/core/25-status.js");
 var helper = require("node-red-node-test-helper");
 var fs = require("fs");
 
@@ -50,7 +51,7 @@ describe('RPI GPIO Node', function() {
 
     it('should load Input node', function(done) {
         var flow = [{id:"n1", type:"rpi-gpio in", name:"rpi-gpio in" }];
-        helper.load(rpi, flow, function() {
+        helper.load(rpiNode, flow, function() {
             var n1 = helper.getNode("n1");
             n1.should.have.property('name', 'rpi-gpio in');
             try {
@@ -69,7 +70,7 @@ describe('RPI GPIO Node', function() {
 
     it('should load Output node', function(done) {
         var flow = [{id:"n1", type:"rpi-gpio out", name:"rpi-gpio out" }];
-        helper.load(rpi, flow, function() {
+        helper.load(rpiNode, flow, function() {
             var n1 = helper.getNode("n1");
             n1.should.have.property('name', 'rpi-gpio out');
             try {
@@ -86,4 +87,68 @@ describe('RPI GPIO Node', function() {
         });
     });
 
+
+    it('should read a dummy value high (not on Pi)', function(done) {
+        var flow = [{id:"n1", type:"rpi-gpio in", pin:"7", intype:"up", debounce:"25", read:true, wires:[["n2"]] },
+        {id:"n2", type:"helper"}];
+        helper.load(rpiNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                try {
+                    msg.should.have.property('topic', 'pi/7');
+                    msg.should.have.property('payload', 1);
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+    });
+
+    it('should read a dummy value low (not on Pi)', function(done) {
+        var flow = [{id:"n1", type:"rpi-gpio in", pin:"11", intype:"down", debounce:"25", read:true, wires:[["n2"]] },
+        {id:"n2", type:"helper"}];
+        helper.load(rpiNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function(msg) {
+                try {
+                    msg.should.have.property('topic', 'pi/11');
+                    msg.should.have.property('payload', 0);
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+    });
+
+    it('should be able preset out to a dummy value (not on Pi)', function(done) {
+        var flow = [{id:"n1", type:"rpi-gpio out", pin:"7", out:"out", level:"0", set:true, freq:"", wires:[], z:"1"},
+        {id:"n2", type:"status", scope:null, wires:[["n3"]], z:"1"},
+        {id:"n3", type:"helper", z:"1"}];
+        helper.load([rpiNode,statusNode], flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            var n3 = helper.getNode("n3");
+            var count = 0;
+            n3.on("input", function(msg) {
+                // Only check the first status message received as it may get a
+                // 'closed' status as the test is tidied up.
+                if (count === 0) {
+                    count++;
+                    try {
+                        msg.should.have.property('status');
+                        msg.status.should.have.property('text', "rpi-gpio.status.na");
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                }
+            });
+            n1.receive({payload:"1"});
+        });
+    });
+
 });
diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js
index 6795e1879..1584ba566 100644
--- a/test/nodes/core/parsers/70-JSON_spec.js
+++ b/test/nodes/core/parsers/70-JSON_spec.js
@@ -265,6 +265,23 @@ describe('JSON node', function() {
         });
     });
 
+    it('should pass an object if provided a valid object and schema and action is object', function(done) {
+        var flow = [{id:"jn1",type:"json",action:"obj",wires:[["jn2"]]},
+                    {id:"jn2", type:"helper"}];
+        helper.load(jsonNode, flow, function() {
+            var jn1 = helper.getNode("jn1");
+            var jn2 = helper.getNode("jn2");
+            jn2.on("input", function(msg) {
+                should.equal(msg.payload.number, 3);
+                should.equal(msg.payload.string, "allo");
+                done();
+            });
+            var obj =  {"number": 3, "string": "allo"};
+            var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
+            jn1.receive({payload:obj, schema:schema});
+        });
+    });
+
     it('should pass a string if provided a valid object and schema', function(done) {
         var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
                     {id:"jn2", type:"helper"}];
@@ -281,6 +298,22 @@ describe('JSON node', function() {
         });
     });
 
+    it('should pass a string if provided a valid JSON string and schema and action is string', function(done) {
+        var flow = [{id:"jn1",type:"json",action:"str",wires:[["jn2"]]},
+                    {id:"jn2", type:"helper"}];
+        helper.load(jsonNode, flow, function() {
+            var jn1 = helper.getNode("jn1");
+            var jn2 = helper.getNode("jn2");
+            jn2.on("input", function(msg) {
+                should.equal(msg.payload, '{"number":3,"string":"allo"}');
+                done();
+            });
+            var jsonString =  '{"number":3,"string":"allo"}';
+            var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
+            jn1.receive({payload:jsonString, schema:schema});
+        });
+    });
+
     it('should log an error if passed an invalid object and valid schema', function(done) {
         var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
                     {id:"jn2", type:"helper"}];
@@ -305,6 +338,78 @@ describe('JSON node', function() {
         });
     });
 
+    it('should log an error if passed an invalid object and valid schema and action is object', function(done) {
+        var flow = [{id:"jn1",type:"json",action:"obj",wires:[["jn2"]]},
+                    {id:"jn2", type:"helper"}];
+        helper.load(jsonNode, flow, function() {
+            try {
+                var jn1 = helper.getNode("jn1");
+                var jn2 = helper.getNode("jn2");
+                var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
+                var obj =  {"number": "foo", "string": 3};
+                jn1.receive({payload:obj, schema:schema});
+                var logEvents = helper.log().args.filter(function(evt) {
+                    return evt[0].type == "json";
+                });
+                logEvents.should.have.length(1);
+                logEvents[0][0].should.have.a.property('msg');
+                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                done();
+            } catch(err) {
+                done(err);
+            }
+        });
+    });
+
+    it('should log an error if passed an invalid JSON string and valid schema', function(done) {
+        var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
+                    {id:"jn2", type:"helper"}];
+        helper.load(jsonNode, flow, function() {
+            try {
+                var jn1 = helper.getNode("jn1");
+                var jn2 = helper.getNode("jn2");
+                var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
+                var jsonString =  '{"number":"Hello","string":3}';
+                jn1.receive({payload:jsonString, schema:schema});
+                var logEvents = helper.log().args.filter(function(evt) {
+                    return evt[0].type == "json";
+                });
+                logEvents.should.have.length(1);
+                logEvents[0][0].should.have.a.property('msg');
+                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                done();
+            } catch(err) {
+                done(err);
+            }
+        });
+    });
+
+    it('should log an error if passed an invalid JSON string and valid schema and action is string', function(done) {
+        var flow = [{id:"jn1",type:"json",action:"str",wires:[["jn2"]]},
+                    {id:"jn2", type:"helper"}];
+        helper.load(jsonNode, flow, function() {
+            try {
+                var jn1 = helper.getNode("jn1");
+                var jn2 = helper.getNode("jn2");
+                var schema = {title: "testSchema", type: "object", properties: {number: {type: "number"}, string: {type: "string" }}};
+                var jsonString =  '{"number":"Hello","string":3}';
+                jn1.receive({payload:jsonString, schema:schema});
+                var logEvents = helper.log().args.filter(function(evt) {
+                    return evt[0].type == "json";
+                });
+                logEvents.should.have.length(1);
+                logEvents[0][0].should.have.a.property('msg');
+                logEvents[0][0].msg.should.equal("json.errors.schema-error: data.number should be number, data.string should be string");
+                logEvents[0][0].should.have.a.property('level',helper.log().ERROR);
+                done();
+            } catch(err) {
+                done(err);
+            }
+        });
+    });
+
     it('should log an error if passed a valid object and invalid schema', function(done) {
         var flow = [{id:"jn1",type:"json",wires:[["jn2"]]},
                     {id:"jn2", type:"helper"}];