chore: merge bugfixes

[ngjaying]

No description provided.

[codecov]

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 ⚠️

Additional details and impacted files

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

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

---

🚨 Try these New Features:

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