Third attempt (and signed).
Closes #40045 (closed)
Patchset includes a fixup! for #40027 (closed), as well.
