[Argha,Carlos] merging selective south sudan changes onto master