One more bullet for upgrades [skip ci] + reorder
One more bullet for upgrades [skip ci] + reorder


Former-commit-id: 05a9f4e9781b981e93b720eb8ddf0abf83ceb500
brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg