Merge pull request #4051 from MervinPraison/claude/issue-4048-20260819-0946