rebase dhcp_checker to master