Merge pull request #4020 from MervinPraison/claude/issue-4019-20260818-0710