Merge branch '2021-07-15-assorted-fixes'