am 3746be26: DHCP changes from master

* commit '3746be268c1b70ebbf0dee6ed21b7efb479414c9':
  DHCP changes from master