Merge "Switch DHCP server based on global setting"