8 Commits (fix-benchmarks)