chore: Bundle/2.x (#33793)