Draft: Jaro's changes to !9874
I've done a rebase of !9874 to avoid #23779 (closed), but I'd like @sgraf812 to review it before pushing it to the main wip/T20749 branch.
I've done a rebase of !9874 to avoid #23779 (closed), but I'd like @sgraf812 to review it before pushing it to the main wip/T20749 branch.