Merge pull request #3995 from MervinPraison/claude/issue-3992-20260816-1716