Hi, the launch process would deserve more deeper refactoring (including controller), but no chance for this in 1.0 scope. This patchset at least splits the method into smaller chunks. BZ fix itself is quite short.