Startup changes merge to dev

Plz request merge to dev kthx.