Co-Authored-By: Claude <noreply@anthropic.com>
(cherry picked from commit 562bfa51bd6ee86d1f8f5558b1ad466c7e4b4517)
(cherry picked from commit 0779d6944ede8afdff6ab49ea5d2caad19dfbfa3)
(cherry picked from commit 38e224f5c5037b7c79a283ab058582a3ad200339)