Merge "Benchmark fix." into tm-dev