Merge pull request #4046 from MervinPraison/claude/issue-4043-20260819-0917