Since 7.21 it is possible to specify Agent Remote Id and Agent Circuit Id for DHCP leases. These parameters work similarly to Client ID parameter- the server will use the lease for a request if those parameters match.
You could also set Dynamic Lease Identifiers to Option 82 in DHCP server. then the newly created dynamic lease will be populated with those Option 82 parameters only. This is useful when you don’t want to trust the values generated by clients.