Upgrade disaster F16->F17 (planned to go to F18)