Created by: efritz
Merged a more recent main branch with #32073.
main
Rely on CI to show the test passes.