Merge "Benchmark-mode for macrobench"