Merge pull request #4047 from MervinPraison/claude/issue-4044-20260819-0917