towards support for different upgrade variants (still incomplete)