Merge "patch up a bit of reporting metric logic" into main