Merge branch '2020-05-08-assorted-fixes'