Fix to a race condition
Moved setup wizard warning, for SaaS-style installs to have a better start situation
Fixes to two potential memory usage issues
Fixes to two potential memory usage issues
Fix for race condition
Merge branch 'master' into v9
Merged with v9