[fixme] #2818 conflicts with staging-28

[dd-devflow]

We couldn't merge the commit 96c47cc4f5 from #2818 into staging-28, there is a conflict!

We created this pull request so that you can fix those conflicts by clicking on the Resolve conflicts button at the bottom of this page.

If the conflicts are not trivial, you can also resolve them locally by running the following commands in your terminal:

git fetch origin fix-merge-96c47cc4f5-into-staging-28 staging-28
git checkout fix-merge-96c47cc4f5-into-staging-28
git merge origin/staging-28
# fix the conflicts and commit
git push origin fix-merge-96c47cc4f5-into-staging-28

When this is done, DO NOT MARK THIS PR AS READY FOR REVIEW but comment it with /resume, we will merge the fix branch into the target branch for you.

Alternatively, you can cancel this operation by commenting this PR with /resume -c