Mobile SDK: master to unstable merge