Merge topic 'yardstick-integ-v2'