Merge "Adding a failure investigator" into ub-launcher3-master