Merge branch '2021-08-21-assorted-changes'