Merge branch '2021-10-03-platform-updates' into next