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