Merge pull request #4034 from MervinPraison/claude/issue-4033-20260819-0710