Merge branch '2024-05-02-assorted-updates'