Merge branch '2022-02-11-assorted-updates-and-fixes'