Merge branch '2021-09-23-assorted-updates' into next