Merge branch '2020-10-14-assorted-changes'