Merge pull request #4010 from MervinPraison/claude/issue-4009-20260817-0851