chore: Cherry picked DIA-820 and LEAP-396 into release 1.11.0

[juliosgarbi]

PR fulfills these requirements

• Commit message(s) and PR title follows the format [fix|feat|ci|chore|doc]: TICKET-ID: Short description of change made ex. fix: DEV-XXXX: Removed inconsistent code usage causing intermittent errors
• Tests for the changes have been added/updated (for bug fixes/features)
• Docs have been added/updated (for bug fixes/features)
• Best efforts were made to ensure docs/code are concise and coherent (checked for spelling/grammatical errors, commented out code, debug logs etc.)
• Self-reviewed and ran all changes on a local instance (for bug fixes/features)

Change has impacts in these area(s)

(check all that apply)

• Product design
• Backend (Database)
• Backend (API)
• Frontend

Describe the reason for change

(link to issue, supportive screenshots etc.)

What does this fix?

(if this is a bug fix)

What is the new behavior?

(if this is a breaking or feature change)

What is the current behavior?

(if this is a breaking or feature change)

What libraries were added/updated?

(list all with version changes)

Does this change affect performance?

(if so describe the impacts positive or negative)

Does this change affect security?

(if so describe the impacts positive or negative)

What alternative approaches were there?

(briefly list any if applicable)

What feature flags were used to cover this change?

(briefly list any if applicable)

Does this PR introduce a breaking change?

(check only one)

• Yes, and covered entirely by feature flag(s)
• Yes, and covered partially by feature flag(s)
• No
• Not sure (briefly explain the situation below)

What level of testing was included in the change?

(check all that apply)

• e2e
• integration
• unit

Which logical domain(s) does this change affect?

(for bug fixes/features, be as precise as possible. ex. Authentication, Annotation History, Review Stream etc.)

• chore: Cherry picked DIA-820 into release 1.11.0 dm2#292

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6a5f691) 75.88% compared to head (b9d8e95) 75.89%.

Additional details and impacted files

@@                Coverage Diff                 @@
##           ls-release/1.11.0    #5332   +/-   ##
==================================================
  Coverage              75.88%   75.89%           
==================================================
  Files                    154      154           
  Lines                  12925    12926    +1     
==================================================
+ Hits                    9808     9810    +2     
+ Misses                  3117     3116    -1     

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