Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request...