hotfix startup fail studio-webapp
Merge branch 'master' into devel