Forward-port changes from release-1.1

[codecov[bot]]

Codecov Report

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

Project coverage is 68.05%. Comparing base (c1dd9d4) to head (630ffca).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #937 +/- ## ========================================== - Coverage 68.38% 68.05% -0.34% ========================================== Files 281 281 Lines 7379 7421 +42 ========================================== + Hits 5046 5050 +4 - Misses 2333 2371 +38 ```

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