a5d68dc890
No conflicts: carries #1230's merge of origin/main up the stack. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>