Merge "Refine validation metrics" into rvc-dev