Adjust launch configuration
Merge branch 'hotfix/adjust_launch_configuration'