Merge branch '2022-08-20-assorted-updates'