MOBILE-1629
[Quick Fix]
MOBILE-1965
MOBILE-1964
MOBILE-1968
Merge pull request #161 from jmpascal/master

[QA Fix]