Merge "Revert "Disable failing tests as cause is investigated"" into main