Merge branch '2023-06-23-assorted-important-fixes'

- Merge in a few important fixes.  This includes a (partial) regression
  fix, updating documentation and some sanity checking around image
  loading.