[Update] #21597 Copy Update

Is code sexy? #21597