Merge pull request #4012 from MervinPraison/claude/issue-4011-20260817-0915