Merge pull request #4017 from MervinPraison/claude/issue-4016-20260817-1715