https://github.com/kubernetes/kubernetes/pull/116396 is heading to upstream Kubernetes 1.26.z. Depending on when it's merged there and what Kubernetes we have in OCP, we may need to cherry-pick the PR into OCP before we merge the whole 1.26.z in the usual way. Goal: we can test disabling the feature gate and we can allow customers to opt-out in an early 4.13 release.

The carry patch will go away during 4.13 lifecycle and will be replaced by 116396 from upstream.