Changed launch config.
Merge branch 'master' into merge-8.0