Fixed critical issue in refactored startup code
Merge branch 'master' into config