Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging