refactor: use BundleBuilder
as a state builder
#8861
Merged
BundleBuilder
as a state builder
#8861