[Review] MOBSDK-452 / MOBSDK-485
[Review] MOBSDK-457
[Review] PullRequest #22.