fix attempt for hopper...
Merge branch 'feature/shutdown' into feature/unit_restart