Improved handling of ip in schema.
Merge branch 'test' into dev