Merge "Mark even more Bundles as defusable." into nyc-dev