[release-3.2] chore: cherry pick release-3.2
Created by: harrisonliu5
What type of PR is this?
/kind regression
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for reviewers:
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: