WIP: force-restart-state #223

Draft
Alfred-mk wants to merge 6 commits from force-restart-state into master

6 Commits