MOBILE-2224
MOBILE-2173
Merge pull request #177 from jmpascal/1.4-Dev

[Fix]