Merge "Tests failed randomly"