Merge "Greatly reduce BenchmarkState overhead"