[Argha] merging master into south_sudan for relevant submodule