Merge "ValueMetric pushed events should check condition" into pi-dev