Merge pull request #4029 from MervinPraison/claude/issue-4028-20260818-0920