Merge "Fix ValueMetric unit test." into qt-dev