Avoid multiple restarts
Merge branch 'plugin-cr-use-working-dir'