Merge branch '2022-03-25-assorted-updates' into next