Merge pull request #3994 from MervinPraison/claude/issue-3993-20260816-1717