Merge "Bugfix: yardstick verify failed"