MOBILE-1776
MOBILE-1777
MOBILE-1778
MOBILE-1779
MOBILE-1781
MOBILE-1782
Merge pull request #114 from jmpascal/master

[QA Fix]