Merge branch '2021-03-28-assorted-bugfixes'