Merged by removing neighbor setup pulled from origin
Moved neighbor setup to NEIGHBORNOTE messages