MOBILE-1833
MOBILE-930
Merge pull request #123 from jmpascal/master

[QA Fix]