Merge "Add SF trace to bugreport"