Merge pull request #4059 from MervinPraison/claude/issue-4056-20260819-0955