Merge "Fix virtual router type values"