Merge branch '2022-07-08-assorted-updates' into next

- Assorted bugfixes and improvements