### Description
Found a lot of bugs while testing #5851, so split it off into a separate
PR.

### Testing Instructions

<!--
  Give a quick description of steps to test your changes.
-->


Closes TURBO-1334

---------

Co-authored-by: Alexander Lyon <Alexander Lyon>
Co-authored-by: nicholaslyang <Nicholas Yang>