Resolves node dependency issues
Merge branch 'node-depen-fix' into dev-master
Build Node
Merge branch 'dev-master' into dev-3.x