Merge "update current config with dhcp settings"