Backport doc changes

[mrichtarsky]

Includes changes from #8483 #8484

[codecov[bot]]

Codecov Report

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

Project coverage is 82.53%. Comparing base (b07add6) to head (a4170f5). Report is 4 commits behind head on 1.2-maint.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## 1.2-maint #8544 +/- ## ============================================= + Coverage 82.39% 82.53% +0.13% ============================================= Files 38 38 Lines 10839 10839 Branches 2080 1793 -287 ============================================= + Hits 8931 8946 +15 + Misses 1352 1351 -1 + Partials 556 542 -14 ```

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

[ThomasWaldmann]

Thanks!