Merge branch '2021-03-19-assorted-fixes'