S30 569 build – DHCP scope options 186/187

Not sure if I should post this under WDM or Win CE but here it goes:

We have many S30s out on the network alone with older devices. The older devices are being replaced with newer S30s with a 569 build applied to them.

For whatever reason, these devices will not pickup the DHCP scope option tag settings to tell them where the WDM server is! If you load on an older build then they work fine. I’m not sure what I can do to remedy this.
If I manually enter in the WDM server IP it registers fine. I took a config from a WID with the build and under the HAGENT registry key the option tags are correctly set at 186 and 187. However, if I then manually change the WDM server IP on the S30 and remove the device from WDM, I would expect that after renewing the IP address on the device, that the WDM server IP would be repopulated (because of the DHCP Scope option tag) – but it doesnt!? If I do the same test with an S30 with a 561 build, it works perfectly fine.

Why? And most importantly, how can I fix it? Using another build would not be possible because 569 has already been agreed to be rolled out 🙁

Thanks

Mark