Merge pull request #4031 from MervinPraison/claude/issue-4030-20260818-0944