[IMP] Improve stop_after_upgrades option management