Merge branch '2022-06-16-assorted-bugfixes'