Merge pull request #3751 from ianchi/node