Fixed a startup concurrency issue.
Merge