Backport 1441 to 1.8

[grcevski]

Backport of #1441 to release-1.8

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.03%. Comparing base (3fb71e9) to head (9c230c7).
Report is 1 commits behind head on release-1.8.

Additional details and impacted files

@@               Coverage Diff               @@
##           release-1.8    #1442      +/-   ##
===============================================
- Coverage        81.09%   81.03%   -0.07%     
===============================================
  Files              140      140              
  Lines            14068    14070       +2     
===============================================
- Hits             11409    11402       -7     
- Misses            2139     2145       +6     
- Partials           520      523       +3     

Flag	Coverage Δ
integration-test	57.06% <100.00%> (-0.03%)	⬇️
k8s-integration-test	57.92% <100.00%> (-0.16%)	⬇️
oats-test	36.27% <0.00%> (-0.01%)	⬇️
unittests	52.08% <66.66%> (+0.02%)	⬆️

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.