Merge branch '2022-05-06-assorted-updates'