Fixed launcher scripts
Merge branch 'shell-fix' into enterprise