Merge branch '2022-08-10-assorted-updates'

- An assortment of bugfixes and minor updates