Merge "Refine validation metrics"