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