Merge "Fix the benchmark fail by caliper's change"