Should happen before 1.21 release. https://github.com/kubernetes/kubernetes/pull/97823 has the changes we want. /cc @Jiawei0227