Only add the node if it is new.
Merge branch 'master' into working