Draft: Outdated

I utterly blew up this branch with Git silliness and non-maintainers can't squash commits. I succumbed to the Git demons and opened a new branch and MR.

!2555 (merged)