Merge pull request #4060 from MervinPraison/claude/issue-4053-20260819-0953