Merge branch '2021-04-27-assorted-fixes'