MOBILE-2359
MOBILE-2358
Merge pull request #188 from jmpascal/1.4-Dev

1.4 dev