Merge pull request #4014 from MervinPraison/claude/issue-4013-20260817-0948