MOBILE-1820
MOBILE-1936
Merge pull request #69 from jmpascal/master

[QA Fix]