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