Startup/Restart issues resolved.
Merge remote-tracking branch 'upstream/dev' into dev