Merge pull request #4045 from MervinPraison/claude/issue-4042-20260819-0916