Catalog taken from master (2e2d927a); the branch's catalog change is replayed by the next commit. Scenarios.cs: both lists unioned. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>