Merge branch '2023-04-24-TI-platform-updates'