WIP: handle upgrade_only option