Gh fixes

[mstoykov]

What?

Fix problems with the changes from #3371

Why?

So that release can work

Checklist

• I have performed a self-review of my code.
• I have added tests for my changes.
• I have run linter locally (make ci-like-lint) and all checks pass.
• I have run tests locally (make tests) and all tests pass.
• I have commented on my code, particularly in hard-to-understand areas.

Related PR(s)/Issue(s)

[codecov-commenter]

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (5ceb210) 72.81% compared to head (e746a96) 72.96%.

❗ Current head e746a96 differs from pull request most recent head b06cf45. Consider uploading reports for the commit b06cf45 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3378      +/-   ##
==========================================
+ Coverage   72.81%   72.96%   +0.15%     
==========================================
  Files         259      261       +2     
  Lines       20016    20018       +2     
==========================================
+ Hits        14574    14607      +33     
+ Misses       4507     4484      -23     
+ Partials      935      927       -8     

Flag	Coverage Δ
ubuntu	72.90% <ø> (?)
windows	72.81% <ø> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 11 files with indirect coverage changes

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