Merge "Correct isLegacy metric data" into main