What problem does this PR solve?
fixes: #807
What is changed and how does it work?
Check List
Tests
- E2E test
Code changes
- Has Go code change
Side effects
Related changes
- Need to cherry-pick to the release branch
Does this PR introduce a user-facing change?:
release-note
NONE
