Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b' * commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b': Fix issue #2951784: Launcher crashes on startup
Merge commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b' * commit 'efd05ea69a53d73d2dacacd74f6a420cac8ef97b': Fix issue #2951784: Launcher crashes on startup