Rebuild both canonical bundle trees after rebasing #86 onto the merged discovery-filter changes. Issue: #86 User-Visible: no Release: v1.70.0-beta.1