Auto-reload server can now be started when using the watcher
Merge branch 'feature-autoenablereload' into dev