dc01c17cc0 HV upgrade (#22517)