Migrate Nodes

There are some code that has been merged into CB2B1 but not in master. But I don't think it will result in  conflicts.