Merge pull request #4040 from MervinPraison/claude/issue-4037-20260819-0850