MOBILE-2671
Merge pull request #243 from jmpascal/MERGING-1

MOBILE-2671