Merge pull request #3293 from NeoRaider/node