Modify launch mode
Merge branch 'develop'