Merge pull request #4036 from MervinPraison/claude/issue-4035-20260819-0828