Merge pull request #4022 from MervinPraison/claude/issue-4021-20260818-0818