MOBSDK-432 / MOBSDK-471 / MOBSDK-513 (partially)