Node dependencies
Merge branch 'feature-node-dependencies' into dev