Clean rebase from upstream/main — single-line addition. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>