Merge "Fix for DHCP with Metadata"