Merge from Feature/dynamic nodes