Improved ip assignments.
Merge branch 'test' into dev