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