Merge "bugfix: yardstick reporing in stable branch omit stable/"