Backport 10534 to 1.8.latest

[MichelleArk]

Manual backport of #10534 to 1.8

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.26%. Comparing base (4f50172) to head (a56ffd1).

Additional details and impacted files

@@              Coverage Diff               @@
##           1.8.latest   #10541      +/-   ##
==============================================
- Coverage       88.32%   88.26%   -0.06%     
==============================================
  Files             181      181              
  Lines           22776    22779       +3     
==============================================
- Hits            20116    20106      -10     
- Misses           2660     2673      +13     

Flag	Coverage Δ
integration	85.44% <100.00%> (-0.15%)	⬇️
unit	62.81% <92.85%> (+0.03%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[github-actions]

The backport to 1.7.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.7.latest 1.7.latest
# Navigate to the new working tree
cd .worktrees/backport-1.7.latest
# Create a new branch
git switch --create backport-10541-to-1.7.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 60315b6a750c2065db342ec26ba8c1696325f7e6
# Push it to GitHub
git push --set-upstream origin backport-10541-to-1.7.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.7.latest

Then, create a pull request where the base branch is 1.7.latest and the compare/head branch is backport-10541-to-1.7.latest.