Merge branch '2023-08-03-assorted-fixes'