Network SDK: Merging master to unstable