Hotfix for windows startup issue
Merge branch 'master' into develop