[Argha] merging latest changes on master into south_sudan