merge: polish

[tsibley]

See commit messages.

Checklist

• [x] Automated checks pass
• [x] Check if you need to add a changelog message
• [x] Check if you need to add tests
• [x] Check if you need to update docs

[codecov[bot]]

Codecov Report

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

Project coverage is 70.56%. Comparing base (d8faf01) to head (ddca760). Report is 120 commits behind head on master.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #1591 +/- ## ========================================== + Coverage 70.51% 70.56% +0.04% ========================================== Files 78 78 Lines 8107 8119 +12 Branches 1966 1967 +1 ========================================== + Hits 5717 5729 +12 Misses 2100 2100 Partials 290 290 ```

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

---

🚨 Try these New Features:

• Flaky Tests Detection - Detect and resolve failed and flaky tests

[tsibley]

Rebased onto latest master so linkcheck passes.

[tsibley]

One more bit of error polishing coming in a few minutes…