Merge branch '2021-05-26-assorted-bugfixes'