Fix call to wrong method
Launcher: Provide hints where to look for help
Merge remote-tracking branch 'origin/2.0'