Merge "Removing automatic failure investigator"