Merge branch '2021-01-16-assorted-improvements'