Merge branch '2024-04-12-assorted-updates'

- Assorted sandbox fixes, cleanup some of the partition table code and a
  few other fixes