Merge branch '2020-09-12-assorted-bugfixes'