Merge branch '2021-07-24-arm-and-platform-updates'