Merge pull request #4062 from MervinPraison/claude/issue-4052-20260819-0953