Merge branch '2023-06-20-assorted-update' into next

- Assorted updates and improvements