Use MetricValue with units

[#74358804]