[Argha,Carlos] merged selected changes from south_sudan into master
[Argha,Carlos] merged selective changes from south_sudan into master