6bd80fe817
No conflicts: brings #1215's merge of origin/main into this stacked branch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>