3/07 Nodes ipinterface update
Merge remote-tracking branch 'origin/kicho'