Launcher culprit found and fixed.
Merge branch 'master' into develop