merge main and resolve conflicts

Commit

227 days ago

merge main and resolve conflicts Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>