Backport #448 to v1

[at-wat]

No description provided.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.88%. Comparing base (0947a5a) to head (a925475).
⚠️ Report is 1 commits behind head on v1.

Additional details and impacted files

@@            Coverage Diff             @@
##               v1     #452      +/-   ##
==========================================
+ Coverage   81.25%   81.88%   +0.63%     
==========================================
  Files           5        5              
  Lines         416      414       -2     
==========================================
+ Hits          338      339       +1     
+ Misses         47       45       -2     
+ Partials       31       30       -1     

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

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.