Merge branch 'hishamhm-pull-1010'