Merge pull request #4008 from MervinPraison/claude/issue-4007-20260817-0831