Merge commit '6fa8d51479e9a5542c67bec715a1f68e7ed057ba'
Merge commit '6ee9beab3209bc301af98ee881bd15f0aeea2513' as 'externals/zydis'