Harmony backports

[S7evinK]

Backport a few things from Harmony.

Pull Request Checklist

• I have added Go unit tests or Complement integration tests for this PR or I have justified why this PR doesn't need tests
• Pull request includes a sign off below or I have already signed off privately

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.38%. Comparing base (f0578a5) to head (fb059f2).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3581      +/-   ##
==========================================
- Coverage   49.40%   49.38%   -0.02%     
==========================================
  Files         524      524              
  Lines       59822    59827       +5     
==========================================
- Hits        29553    29548       -5     
- Misses      26785    26791       +6     
- Partials     3484     3488       +4     

Flag	Coverage Δ
unittests	49.38% <100.00%> (-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.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.