Original PR: #40410.
Original PR: #40410.