Add --no-startup-id where needed.
Merge branch 'master' into leo-work