Fixes #4168: Upgrading order for 2.8 is not sufficiently visible