Merge branch '2023-01-12-further-assorted-general-updates'