[Argha, Carlos] merged selective changes from south_sudan onto master.