Fix #33291 (cherry picked from commit dcd3014567f2b8be3fca01c20c2b3eabdc8f519e) Conflicts: tests/integration/feed_user_test.go trivial context conflict