Merge branch '2021-10-06-assorted-improvements'