Reduce startup time
Merge branch 'startup-time' into dev
Fix broken merge