Merge branch '2021-06-22-assorted-fixes'