Merge "Improve metrics logic" into main