How to categorize this PR?

/kind

/cherry-pick release-v1.34 /cherry-pick release-v1.35 /cherry-pick release-v1.36

What this PR does / why we need it:

Which issue(s) this PR fixes: Fixes #

Special notes for your reviewer:

Breaking changes: