Merge branch '2023-12-20-assorted-general-updates' into next

- Assorted fixes around the tree