[Argha, Carlos] merged selective changes from south sudan into master