Refactor start
Refactor pre-restart
Reboot
Commit pre-1.6.2