Merge "Fix duplicate node definition"