Auto backport of pr 1596 on 0.10.x

[ilan-gold]

• [ ] Closes #
• [ ] Tests added
• [ ] Release note added (or unnecessary)

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 84.01%. Comparing base (bb5bf85) to head (168ff33). Report is 1 commits behind head on 0.10.x.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## 0.10.x #1618 +/- ## ======================================= Coverage 84.01% 84.01% ======================================= Files 37 37 Lines 5592 5592 ======================================= Hits 4698 4698 Misses 894 894 ```