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