Merge pull request #4003 from MervinPraison/claude/issue-4001-20260817-0717