Upgrade rework

brickoderequested to merge
(removed):upgrade into pregmod-master

Reworked with more clearly defined tiers.

Edited by brickode

Merge request reports