Merge pull request #4026 from MervinPraison/claude/issue-4025-20260818-0849