Merge 2_1

[dczulada]

Pull requests into Cypress require the following. Submitter and reviewer should :white_check_mark: when done. For items that are not-applicable, note it's not-applicable ("N/A") and :white_check_mark:.

Submitter:

• [ ] This pull request describes why these changes were made.
• [ ] Internal ticket for this PR:
• [ ] Internal ticket links to this PR
• [ ] Code diff has been done and been reviewed
• [ ] Tests are included and test edge cases
• [ ] Tests have been run locally and pass

Reviewer 1:

Name:

• [ ] Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
• [ ] The tests appropriately test the new code, including edge cases
• [ ] You have tried to break the code

Reviewer 2:

Name:

• [ ] Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
• [ ] The tests appropriately test the new code, including edge cases
• [ ] You have tried to break the code

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Comparison is base (7243083) 96.61% compared to head (2d49a1b) 96.58%. Report is 46 commits behind head on cypress_v7.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## cypress_v7 #1863 +/- ## ============================================== - Coverage 96.61% 96.58% -0.03% ============================================== Files 156 156 Lines 7083 7083 ============================================== - Hits 6843 6841 -2 - Misses 240 242 +2 ```

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