Merge branch '2023-10-11-assorted-fixes-and-updates'