Merge remote-tracking branch 'ms/x86_64' into next