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