[Argha,Carlos] merged South Sudan specific changes into master