[WIP] Addressing bundle upgrade.