From 3c9d6f111d2c0f5ed52fa819173e567c995c68dd Mon Sep 17 00:00:00 2001
From: Andrei-George Stoica <5600871+andreiztm@users.noreply.github.com>
Date: Wed, 2 Apr 2025 14:59:46 +0300
Subject: [PATCH] Update policy-csp-deliveryoptimization.md

---
 .../client-management/mdm/policy-csp-deliveryoptimization.md    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/windows/client-management/mdm/policy-csp-deliveryoptimization.md b/windows/client-management/mdm/policy-csp-deliveryoptimization.md
index 080e775bf4..f5a49685d6 100644
--- a/windows/client-management/mdm/policy-csp-deliveryoptimization.md
+++ b/windows/client-management/mdm/policy-csp-deliveryoptimization.md
@@ -219,6 +219,8 @@ Specifies how your client(s) can discover Microsoft Connected Cache servers dyna
 <!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
 > [!NOTE]
 > If the DHCP Option ID is formatted incorrectly, the client will fall back to the [Cache Server Hostname](#docachehost) policy value if that value has been set.
+> 
+> If [LocalPolicyMerge](/windows/security/operating-system-security/network-security/windows-firewall/rules#local-policy-merge-and-application-rules) setting is configured (e.g. as part of security baselines) it can impact DHCP client and prevent it from retrieving this DHCP option, especially in Autopilot scenarios.
 <!-- DOCacheHostSource-Editable-End -->
 
 <!-- DOCacheHostSource-DFProperties-Begin -->