Restart the engine rather than the entire application on a configuration
change (and various other improvements)