MOBILE-1815
MOBILE-1839
Merge pull request #129 from jmpascal/master

[QA Fix]