Refactor to node alias
Merge branch 'vanilla_improvements' into datacratic_dev