Fix for networks that has no ip
Merge branch 'test' into dev