Merging mobilesdk.unstable to mobilesdk