Merge branch '2021-04-22-assorted-updates'