chore: merge bugfixes

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 50.00000% with 7 lines in your changes missing coverage. Please review.

Please upload report for BASE (master-2.0@3903dd6). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
pkg/connection/conn.go	46.15%	5 Missing and 2 partials :warning:

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master-2.0 #3377 +/- ## ============================================= Coverage ? 71.12% ============================================= Files ? 399 Lines ? 45218 Branches ? 0 ============================================= Hits ? 32159 Misses ? 10532 Partials ? 2527 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

---

🚨 Try these New Features:

• Flaky Tests Detection - Detect and resolve failed and flaky tests