Fix average computation

Change-Id: I374f10bffdea4440096e8dc6a3656059d76040cd
Merge topic 'pvw-web-viz-improvement' into next

d2bd0a9 Fix average computation