Replacing !434 (closed), with the following changes:
- rebased on master (fixing some small conflict with 2d10beb4)
- squashed one fixup commit
Closes #32355
/cc @JeremyRand
Replacing !434 (closed), with the following changes:
Closes #32355
/cc @JeremyRand