Backport PR 5254

[tarakby]

Backport #5254 into v0.33

⚠️ Will wait for:

• the Cadence changes to be merged
• the HCU version to be tagged as v0.33.7

Only then this PR can be opened and merged.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (204a1a2) 57.51% compared to head (708524b) 55.51%.

Additional details and impacted files

@@            Coverage Diff             @@
##            v0.33    #5359      +/-   ##
==========================================
- Coverage   57.51%   55.51%   -2.01%     
==========================================
  Files         814      995     +181     
  Lines       77831    95723   +17892     
==========================================
+ Hits        44763    53137    +8374     
- Misses      29666    38608    +8942     
- Partials     3402     3978     +576     

Flag	Coverage Δ
unittests	55.51% <ø> (-2.01%)	⬇️

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.