Another fix for static host/ip
Merge branch 'test' into dev