Merge pull request #4054 from MervinPraison/claude/issue-4050-20260819-0947