Merge "Hunter stable branch for Yardstick"