Merge pull request #4039 from MervinPraison/claude/issue-4038-20260819-0851