Merge pull request #3978 from MervinPraison/claude/issue-3977-20260816-0712