Merge "Fix ManualBenchmarkState iteration unit" into tm-dev