Merge branch '2022-05-09-TI-platform-updates'

- Assorted minor TI platform updates