Merge branch '2021-07-14-platform-updates'

- Assorted platform updates