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