Pre Launch
Merge branch 'launcher'