Merge pull request #4057 from MervinPraison/claude/issue-4049-20260819-0947