Merge pull request #4061 from MervinPraison/claude/issue-4055-20260819-0954