Merge changes from topic "new-metrics-for-averages"

* changes:
  [automerged blank] Add new metrics to report averages as sum and count 2p: c9b7f61cdf
  Add new metrics to report averages as sum and count