Merge with latest code and add dhcp agent