Merge pull request #4004 from MervinPraison/claude/issue-4002-20260817-0718