Merge branch '2023-07-20-assorted-CI-updates'