dont wait to restart. better logging.
Merge branch 'master' into test-env

* master:
  dont wait to restart. better logging.