MOBILE-1957
MOBILE-1846
[Quick Fix]
Merge pull request #160 from jmpascal/master

Fix