Closes #40369. Salvaged from #40502; cleaned up, re-verified against main, tests added. Co-authored-by: r266-tech <r266-tech@users.noreply.github.com>
Closes #40369. Salvaged from #40502; cleaned up, re-verified against main, tests added. Co-authored-by: r266-tech <r266-tech@users.noreply.github.com>