Merge pull request #16027 from shibayan:arm64-windows10