Automatic merge from submit-queue (batch tested with PRs 38772, 38797, 40732, 40740) Sync client-go – third try Follow-up of https://github.com/kubernetes/kubernetes/pull/40692 & https://github.com/kubernetes/kubernetes/pull/40699. Approval and lgtm from https://github.com/kubernetes/kubernetes/pull/40692.