MOBILE-1843
MOBILE-1564
MOBILE-1843
MOBILE-1586
Merge pull request #130 from jmpascal/master

[Bug fix]