Revert "Merge marwensdiri/master"

This reverts commit 61a65637bf497a6247159ca350038b117281f48e.
Merge origin/master