Merge "Extend HBDMetricTest" into nextgenv2