MOBILE-2246 & MOBILE-2404
Merge pull request #199 from jmpascal/1.4-Dev

MOBILE-2246 & MOBILE-2404