[Argha] merged branch master into south_sudan for relevant submodule.