Created by: LawnGnome
This is a WIP. Other, smaller PRs will be reviewed and merged.
Eventually fixes #17879 (closed).
Each of these will likely be a separate PR.
Push commits to the source branch or add previously merged commits to review them.
