Merge pull request #4027 from MervinPraison/claude/issue-4024-20260818-0849