Merge "Same controller added twice as node spec"