Merge "Fix yardstick.out overwritten bug"