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 67.99%. Comparing base (fac70ec) to head (2e188f2).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #954 +/- ## ========================================== + Coverage 67.92% 67.99% +0.07% ========================================== Files 281 281 Lines 7419 7420 +1 ========================================== + Hits 5039 5045 +6 + Misses 2380 2375 -5 ```

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

[Annopaolo]

Duplicate of #953