MOBSDK-670 and MOBILE-2356