Merge remote-tracking branch 'ehabkost/tags/x86-and-machine-pull-request' into staging