Merge branch '2020-11-18-assorted-fixes'