Merge branch '2022-01-18-platform-updates'