Propperly using the configs ip.
Merge branch 'test' into dev