Revert "[Argha] merging latest changes on master into south_sudan"

This reverts commit 77f771aeb8a930c76418238eeedac9ef169e7a80.
[Argha] merging latest changes on master into south_sudan