Fixed loading of ip.
Merge branch 'test' into dev