Co-Authored-By: Claude <noreply@anthropic.com>
(cherry picked from commit 6277a98f3ff6207bd215213af514c5f6fb481532)
(cherry picked from commit 646f4055b180d98ccc6ac6898b64ba97f9e2ad7d)
(cherry picked from commit b21932ed7058cec68da01d337ba46521501ebc49)