chore: cherry-pick #9023

[SamuelSalas]

This PR cherry-picks #9084

[github-actions]

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

[github-actions]

Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 091ebb8
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/a5f6b2e9-66f8-4cfb-bb6b-48dc643773bf

Note

• You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

[sonarcloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release/7.19.0@84fd56b). Click here to learn what that means.

Additional details and impacted files

@@                Coverage Diff                @@
##             release/7.19.0    #9085   +/-   ##
=================================================
  Coverage                  ?   43.73%           
=================================================
  Files                     ?     1273           
  Lines                     ?    31119           
  Branches                  ?     3164           
=================================================
  Hits                      ?    13609           
  Misses                    ?    16697           
  Partials                  ?      813           

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

[sethkfman]

LGTM