Merge branch '2021-10-12-assorted-fixes-and-updates'