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