Backport of 1441 to release-1.9

[grcevski]

Backport of #1441

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.98%. Comparing base (0fc22d9) to head (921fca8).
Report is 1 commits behind head on release-1.9.

Additional details and impacted files

@@               Coverage Diff               @@
##           release-1.9    #1443      +/-   ##
===============================================
+ Coverage        78.39%   80.98%   +2.58%     
===============================================
  Files              146      146              
  Lines            14772    14774       +2     
===============================================
+ Hits             11581    11964     +383     
+ Misses            2588     2227     -361     
+ Partials           603      583      -20     

Flag	Coverage Δ
integration-test	58.52% <100.00%> (?)
k8s-integration-test	59.95% <100.00%> (+0.03%)	⬆️
oats-test	34.05% <0.00%> (+0.05%)	⬆️
unittests	51.75% <66.66%> (+<0.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.