Merge pull request #4005 from MervinPraison/claude/issue-4000-20260817-0717