Added by Rob Nahf about 10 years ago
d1_cn_node_registry_v1.3: committing additional merges from trunk minus the v2 changes.