Dev branch for DHCP CPNR project