CB-7774 Have a separate section on upgrades