Revert "Revert "New bg_bundle field""

This reverts commit 6098ef982169c0ef8c6435c7b755d596dfc535a9.
Revert "Revert "Revert "New bg_bundle field"""

This reverts commit 8d6570a45957bbc54dcf54c9ef8fcc25c942692d.
Revert "Revert "New bg_bundle field""

This reverts commit 6098ef982169c0ef8c6435c7b755d596dfc535a9.