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