Merge "Don't mark SAT/DT as failures" into main