Merge pull request #4067 from MervinPraison/claude/issue-4066-20260819-1715