fix: apply hotfix of 2345.1-hotfix

[jpraynaud]

Content

This PR includes the application of the hotfix created for the 2345.1-hotfix release.

Pre-submit checklist

• Branch
  • Tests are provided (if possible)
  • Crates versions are updated (if relevant)
  • CHANGELOG file is updated (if relevant)
  • Commit sequence broadly makes sense
  • Key commits have useful messages
• PR
  • All check jobs of the CI have succeeded
  • Self-reviewed the diff
  • Useful pull request description
  • Reviewer requested

Issue(s)

Relates to #2771

[github-actions]

Test Results

    4 files  ±0    168 suites  ±0   23m 55s ⏱️ +59s
2 207 tests ±0  2 207 ✅ ±0  0 💤 ±0  0 ❌ ±0 
6 887 runs  ±0  6 887 ✅ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 271f793. ± Comparison against base commit 2ad7d5e.