Fixes #18872 Fixes #18737 Fixes #18801
See docstring for motivation and description
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
Concept ACK
Code review ACK fa3f9a05660687bf4146e089050e944a1d6cbe3c I like how this moves most of the waiting to one, consistent, place.