Merge branch '2022-07-25-assorted-platform-updates'