Mobile SDK Package: Merging master to unstable